diff --git a/pcbnew/dialogs/dialog_export_idf_base.cpp b/pcbnew/dialogs/dialog_export_idf_base.cpp index bfde1a52a2..491559227a 100644 --- a/pcbnew/dialogs/dialog_export_idf_base.cpp +++ b/pcbnew/dialogs/dialog_export_idf_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Aug 17 2014) +// C++ code generated with wxFormBuilder (version Jun 5 2014) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -33,7 +33,7 @@ DIALOG_EXPORT_IDF3_BASE::DIALOG_EXPORT_IDF3_BASE( wxWindow* parent, wxWindowID i m_staticText2->Wrap( -1 ); bSizer3->Add( m_staticText2, 0, wxALL, 5 ); - m_cbAutoAdjustOffset = new wxCheckBox( this, wxID_ANY, _("Auto Adjust"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); + m_cbAutoAdjustOffset = new wxCheckBox( this, wxID_ANY, _("Adjust automatically"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); bSizer3->Add( m_cbAutoAdjustOffset, 0, wxALL, 5 ); wxBoxSizer* bSizer6; @@ -41,13 +41,13 @@ DIALOG_EXPORT_IDF3_BASE::DIALOG_EXPORT_IDF3_BASE( wxWindow* parent, wxWindowID i m_staticText5 = new wxStaticText( this, wxID_ANY, _("Units:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText5->Wrap( -1 ); - bSizer6->Add( m_staticText5, 0, wxALL, 5 ); + bSizer6->Add( m_staticText5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); wxString m_IDF_RefUnitChoiceChoices[] = { _("mm"), _("inch") }; int m_IDF_RefUnitChoiceNChoices = sizeof( m_IDF_RefUnitChoiceChoices ) / sizeof( wxString ); m_IDF_RefUnitChoice = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_IDF_RefUnitChoiceNChoices, m_IDF_RefUnitChoiceChoices, 0 ); m_IDF_RefUnitChoice->SetSelection( 0 ); - bSizer6->Add( m_IDF_RefUnitChoice, 0, wxALL, 5 ); + bSizer6->Add( m_IDF_RefUnitChoice, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); bSizer3->Add( bSizer6, 1, wxEXPAND, 5 ); @@ -55,13 +55,13 @@ DIALOG_EXPORT_IDF3_BASE::DIALOG_EXPORT_IDF3_BASE( wxWindow* parent, wxWindowID i wxBoxSizer* bSizer4; bSizer4 = new wxBoxSizer( wxHORIZONTAL ); - m_staticText3 = new wxStaticText( this, wxID_ANY, _("X ref:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText3 = new wxStaticText( this, wxID_ANY, _("X Position:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText3->Wrap( -1 ); - bSizer4->Add( m_staticText3, 0, wxALL, 5 ); + bSizer4->Add( m_staticText3, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_IDF_Xref = new wxTextCtrl( this, wxID_ANY, _("0"), wxDefaultPosition, wxDefaultSize, 0 ); m_IDF_Xref->SetMaxLength( 8 ); - bSizer4->Add( m_IDF_Xref, 0, wxALL, 5 ); + bSizer4->Add( m_IDF_Xref, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); bSizer3->Add( bSizer4, 1, wxEXPAND, 5 ); @@ -69,19 +69,19 @@ DIALOG_EXPORT_IDF3_BASE::DIALOG_EXPORT_IDF3_BASE( wxWindow* parent, wxWindowID i wxBoxSizer* bSizer5; bSizer5 = new wxBoxSizer( wxHORIZONTAL ); - m_staticText4 = new wxStaticText( this, wxID_ANY, _("Y Ref:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText4 = new wxStaticText( this, wxID_ANY, _("Y Position:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText4->Wrap( -1 ); - bSizer5->Add( m_staticText4, 0, wxALL, 5 ); + bSizer5->Add( m_staticText4, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_IDF_Yref = new wxTextCtrl( this, wxID_ANY, _("0"), wxDefaultPosition, wxDefaultSize, 0 ); m_IDF_Yref->SetMaxLength( 8 ); - bSizer5->Add( m_IDF_Yref, 0, wxALL, 5 ); + bSizer5->Add( m_IDF_Yref, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); bSizer3->Add( bSizer5, 1, wxEXPAND, 5 ); - bSizer2->Add( bSizer3, 1, wxEXPAND, 5 ); + bSizer2->Add( bSizer3, 1, wxEXPAND|wxLEFT, 5 ); wxString m_rbUnitSelectionChoices[] = { _("Millimeters"), _("Mils") }; int m_rbUnitSelectionNChoices = sizeof( m_rbUnitSelectionChoices ) / sizeof( wxString ); diff --git a/pcbnew/dialogs/dialog_export_idf_base.fbp b/pcbnew/dialogs/dialog_export_idf_base.fbp index 3af95875c1..8967150e98 100644 --- a/pcbnew/dialogs/dialog_export_idf_base.fbp +++ b/pcbnew/dialogs/dialog_export_idf_base.fbp @@ -276,9 +276,9 @@ none 5 - wxEXPAND + wxEXPAND|wxLEFT 1 - + bSizer3 wxVERTICAL @@ -399,7 +399,7 @@ 0 0 wxID_ANY - Auto Adjust + Adjust automatically 0 @@ -454,18 +454,18 @@ - + 5 wxEXPAND 1 - + bSizer6 wxHORIZONTAL none 5 - wxALL + wxALIGN_CENTER_VERTICAL|wxALL 0 1 @@ -548,7 +548,7 @@ 5 - wxALL + wxALIGN_CENTER_VERTICAL|wxALL 0 1 @@ -647,7 +647,7 @@ none 5 - wxALL + wxALIGN_CENTER_VERTICAL|wxALL 0 1 @@ -677,7 +677,7 @@ 0 0 wxID_ANY - X ref: + X Position: 0 @@ -730,7 +730,7 @@ 5 - wxALL + wxALIGN_CENTER_VERTICAL|wxALL 0 1 @@ -832,7 +832,7 @@ none 5 - wxALL + wxALIGN_CENTER_VERTICAL|wxALL 0 1 @@ -862,7 +862,7 @@ 0 0 wxID_ANY - Y Ref: + Y Position: 0 @@ -915,7 +915,7 @@ 5 - wxALL + wxALIGN_CENTER_VERTICAL|wxALL 0 1 diff --git a/pcbnew/dialogs/dialog_export_idf_base.h b/pcbnew/dialogs/dialog_export_idf_base.h index 47ac6b68f3..131479d2f7 100644 --- a/pcbnew/dialogs/dialog_export_idf_base.h +++ b/pcbnew/dialogs/dialog_export_idf_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Aug 17 2014) +// C++ code generated with wxFormBuilder (version Jun 5 2014) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE!