diff --git a/pcbnew/dialogs/dialog_gen_footprint_position_file_base.cpp b/pcbnew/dialogs/dialog_gen_footprint_position_file_base.cpp index 1a38e98103..c17f5d375d 100644 --- a/pcbnew/dialogs/dialog_gen_footprint_position_file_base.cpp +++ b/pcbnew/dialogs/dialog_gen_footprint_position_file_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 30 2017) +// C++ code generated with wxFormBuilder (version Feb 10 2019) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -14,96 +14,96 @@ DIALOG_GEN_FOOTPRINT_POSITION_BASE::DIALOG_GEN_FOOTPRINT_POSITION_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) { this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize ); - + m_MainSizer = new wxBoxSizer( wxVERTICAL ); - + wxBoxSizer* bUpperSizer; bUpperSizer = new wxBoxSizer( wxHORIZONTAL ); - + wxBoxSizer* bSizerdirBrowse; bSizerdirBrowse = new wxBoxSizer( wxHORIZONTAL ); - + m_staticTextDir = new wxStaticText( this, wxID_ANY, _("Output directory:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextDir->Wrap( -1 ); - bSizerdirBrowse->Add( m_staticTextDir, 0, wxEXPAND|wxRIGHT|wxTOP, 5 ); - + bSizerdirBrowse->Add( m_staticTextDir, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); + m_outputDirectoryName = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_outputDirectoryName->SetToolTip( _("Target directory for plot files. Can be absolute or relative to the board file location.") ); m_outputDirectoryName->SetMinSize( wxSize( 350,-1 ) ); - - bSizerdirBrowse->Add( m_outputDirectoryName, 1, wxBOTTOM|wxEXPAND|wxTOP, 3 ); - - m_browseButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); + + bSizerdirBrowse->Add( m_outputDirectoryName, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + + m_browseButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); m_browseButton->SetMinSize( wxSize( 30,28 ) ); - - bSizerdirBrowse->Add( m_browseButton, 0, 0, 0 ); - - - bUpperSizer->Add( bSizerdirBrowse, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 ); - - + + bSizerdirBrowse->Add( m_browseButton, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + + + bUpperSizer->Add( bSizerdirBrowse, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 10 ); + + m_MainSizer->Add( bUpperSizer, 0, wxEXPAND, 2 ); - + wxBoxSizer* bSizer71; bSizer71 = new wxBoxSizer( wxHORIZONTAL ); - + wxString m_rbFormatChoices[] = { _("ASCII"), _("CSV") }; int m_rbFormatNChoices = sizeof( m_rbFormatChoices ) / sizeof( wxString ); m_rbFormat = new wxRadioBox( this, wxID_ANY, _("Format"), wxDefaultPosition, wxDefaultSize, m_rbFormatNChoices, m_rbFormatChoices, 1, wxRA_SPECIFY_COLS ); m_rbFormat->SetSelection( 0 ); m_rbFormat->SetMinSize( wxSize( 90,-1 ) ); - + bSizer71->Add( m_rbFormat, 1, wxALL, 5 ); - + wxString m_radioBoxUnitsChoices[] = { _("Inches"), _("Millimeters") }; int m_radioBoxUnitsNChoices = sizeof( m_radioBoxUnitsChoices ) / sizeof( wxString ); m_radioBoxUnits = new wxRadioBox( this, wxID_ANY, _("Units"), wxDefaultPosition, wxDefaultSize, m_radioBoxUnitsNChoices, m_radioBoxUnitsChoices, 1, wxRA_SPECIFY_COLS ); m_radioBoxUnits->SetSelection( 0 ); m_radioBoxUnits->SetMinSize( wxSize( 90,-1 ) ); - + bSizer71->Add( m_radioBoxUnits, 1, wxALL, 5 ); - + wxString m_radioBoxFilesCountChoices[] = { _("Separate files for front and back"), _("Single file for board") }; int m_radioBoxFilesCountNChoices = sizeof( m_radioBoxFilesCountChoices ) / sizeof( wxString ); m_radioBoxFilesCount = new wxRadioBox( this, wxID_ANY, _("Files"), wxDefaultPosition, wxDefaultSize, m_radioBoxFilesCountNChoices, m_radioBoxFilesCountChoices, 1, wxRA_SPECIFY_COLS ); m_radioBoxFilesCount->SetSelection( 0 ); m_radioBoxFilesCount->SetToolTip( _("Creates 2 files: one for each board side or\nCreates only one file containing all footprints to place\n") ); - + bSizer71->Add( m_radioBoxFilesCount, 2, wxALL, 5 ); - - + + m_MainSizer->Add( bSizer71, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - + wxBoxSizer* bSizer7; bSizer7 = new wxBoxSizer( wxVERTICAL ); - + m_forceSMDOpt = new wxCheckBox( this, wxID_ANY, _("Include footprints with SMD pads even if not marked Surface Mount"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer7->Add( m_forceSMDOpt, 0, wxALL, 5 ); - + m_messagesPanel = new WX_HTML_REPORT_PANEL( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_messagesPanel->SetMinSize( wxSize( 300,150 ) ); - + bSizer7->Add( m_messagesPanel, 1, wxEXPAND | wxALL, 5 ); - - + + m_MainSizer->Add( bSizer7, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - + m_sdbSizer1 = new wxStdDialogButtonSizer(); m_sdbSizer1OK = new wxButton( this, wxID_OK ); m_sdbSizer1->AddButton( m_sdbSizer1OK ); m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); - + m_MainSizer->Add( m_sdbSizer1, 0, wxALL|wxEXPAND, 5 ); - - + + this->SetSizer( m_MainSizer ); this->Layout(); m_MainSizer->Fit( this ); - + this->Centre( wxBOTH ); - + // Connect Events m_browseButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GEN_FOOTPRINT_POSITION_BASE::OnOutputDirectoryBrowseClicked ), NULL, this ); m_sdbSizer1OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GEN_FOOTPRINT_POSITION_BASE::OnGenerate ), NULL, this ); @@ -114,5 +114,5 @@ DIALOG_GEN_FOOTPRINT_POSITION_BASE::~DIALOG_GEN_FOOTPRINT_POSITION_BASE() // Disconnect Events m_browseButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GEN_FOOTPRINT_POSITION_BASE::OnOutputDirectoryBrowseClicked ), NULL, this ); m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GEN_FOOTPRINT_POSITION_BASE::OnGenerate ), NULL, this ); - + } diff --git a/pcbnew/dialogs/dialog_gen_footprint_position_file_base.fbp b/pcbnew/dialogs/dialog_gen_footprint_position_file_base.fbp index 68b4b0664d..c416ee03a4 100644 --- a/pcbnew/dialogs/dialog_gen_footprint_position_file_base.fbp +++ b/pcbnew/dialogs/dialog_gen_footprint_position_file_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -14,6 +14,8 @@ dialog_gen_footprint_position_file_base 1000 none + + 1 dialog_gen_footprint_positions_base @@ -24,6 +26,7 @@ 1 1 UI + 0 1 0 @@ -52,42 +55,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - m_MainSizer @@ -104,7 +71,7 @@ none 10 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP 1 @@ -113,7 +80,7 @@ none 5 - wxEXPAND|wxRIGHT|wxTOP + wxALIGN_CENTER_VERTICAL|wxRIGHT 0 1 @@ -144,6 +111,7 @@ 0 wxID_ANY Output directory: + 0 0 @@ -169,34 +137,11 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxBOTTOM|wxEXPAND|wxTOP + 5 + wxALIGN_CENTER_VERTICAL|wxEXPAND 1 1 @@ -256,38 +201,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - + 5 + wxALIGN_CENTER_VERTICAL|wxLEFT 0 1 @@ -307,6 +225,7 @@ 1 1 + 0 0 @@ -320,9 +239,10 @@ 0 0 - wxID_ANY MyButton + + 0 0 @@ -337,11 +257,12 @@ protected 1 + + Resizable - 1 - wxBU_AUTODRAW + ; forward_declare 0 @@ -353,29 +274,6 @@ OnOutputDirectoryBrowseClicked - - - - - - - - - - - - - - - - - - - - - - - @@ -455,30 +353,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -545,30 +419,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -635,30 +485,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -734,30 +560,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -815,29 +617,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - @@ -858,14 +637,7 @@ m_sdbSizer1 protected - - - - - OnGenerate - - diff --git a/pcbnew/dialogs/dialog_gen_footprint_position_file_base.h b/pcbnew/dialogs/dialog_gen_footprint_position_file_base.h index 46f454eecf..220cfcfa21 100644 --- a/pcbnew/dialogs/dialog_gen_footprint_position_file_base.h +++ b/pcbnew/dialogs/dialog_gen_footprint_position_file_base.h @@ -1,12 +1,11 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 30 2017) +// C++ code generated with wxFormBuilder (version Feb 10 2019) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#ifndef __DIALOG_GEN_FOOTPRINT_POSITION_FILE_BASE_H__ -#define __DIALOG_GEN_FOOTPRINT_POSITION_FILE_BASE_H__ +#pragma once #include #include @@ -21,10 +20,10 @@ class WX_HTML_REPORT_PANEL; #include #include #include +#include #include #include #include -#include #include #include #include @@ -40,7 +39,7 @@ class WX_HTML_REPORT_PANEL; class DIALOG_GEN_FOOTPRINT_POSITION_BASE : public DIALOG_SHIM { private: - + protected: wxBoxSizer* m_MainSizer; wxStaticText* m_staticTextDir; @@ -54,17 +53,16 @@ class DIALOG_GEN_FOOTPRINT_POSITION_BASE : public DIALOG_SHIM wxStdDialogButtonSizer* m_sdbSizer1; wxButton* m_sdbSizer1OK; wxButton* m_sdbSizer1Cancel; - + // Virtual event handlers, overide them in your derived class virtual void OnOutputDirectoryBrowseClicked( wxCommandEvent& event ) { event.Skip(); } virtual void OnGenerate( wxCommandEvent& event ) { event.Skip(); } - - + + public: - - DIALOG_GEN_FOOTPRINT_POSITION_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Generate Footprint Position Files"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + + DIALOG_GEN_FOOTPRINT_POSITION_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Generate Footprint Position Files"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_GEN_FOOTPRINT_POSITION_BASE(); - + }; -#endif //__DIALOG_GEN_FOOTPRINT_POSITION_FILE_BASE_H__