diff --git a/pcbnew/dialogs/dialog_export_odbpp_base.cpp b/pcbnew/dialogs/dialog_export_odbpp_base.cpp index 66d4855484..19face8a9b 100644 --- a/pcbnew/dialogs/dialog_export_odbpp_base.cpp +++ b/pcbnew/dialogs/dialog_export_odbpp_base.cpp @@ -13,7 +13,7 @@ DIALOG_EXPORT_ODBPP_BASE::DIALOG_EXPORT_ODBPP_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( 380,265 ), wxDefaultSize ); + this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize ); wxBoxSizer* bMainSizer; bMainSizer = new wxBoxSizer( wxVERTICAL ); @@ -22,7 +22,7 @@ DIALOG_EXPORT_ODBPP_BASE::DIALOG_EXPORT_ODBPP_BASE( wxWindow* parent, wxWindowID m_lblBrdFile = new wxStaticText( this, wxID_ANY, _("Output file:"), wxDefaultPosition, wxDefaultSize, 0 ); m_lblBrdFile->Wrap( -1 ); - bSizerTop->Add( m_lblBrdFile, 0, wxALIGN_CENTER_VERTICAL, 5 ); + bSizerTop->Add( m_lblBrdFile, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); m_outputFileName = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_outputFileName->SetToolTip( _("Enter a filename if you do not want to use default file names\nCan be used only when printing the current sheet") ); @@ -39,57 +39,59 @@ DIALOG_EXPORT_ODBPP_BASE::DIALOG_EXPORT_ODBPP_BASE( wxWindow* parent, wxWindowID wxBoxSizer* bSizer3; bSizer3 = new wxBoxSizer( wxHORIZONTAL ); - wxStaticBoxSizer* sbSizer1; - sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("File Format") ), wxVERTICAL ); - wxFlexGridSizer* fgSizer; - fgSizer = new wxFlexGridSizer( 0, 2, 0, 0 ); - fgSizer->AddGrowableCol( 0 ); + fgSizer = new wxFlexGridSizer( 0, 2, 5, 5 ); fgSizer->AddGrowableCol( 1 ); fgSizer->SetFlexibleDirection( wxBOTH ); fgSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_lblUnits = new wxStaticText( sbSizer1->GetStaticBox(), wxID_ANY, _("Units:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_lblUnits = new wxStaticText( this, wxID_ANY, _("Units:"), wxDefaultPosition, wxDefaultSize, 0 ); m_lblUnits->Wrap( -1 ); fgSizer->Add( m_lblUnits, 0, wxALIGN_CENTER_VERTICAL, 5 ); wxString m_choiceUnitsChoices[] = { _("Millimeters"), _("Inches") }; int m_choiceUnitsNChoices = sizeof( m_choiceUnitsChoices ) / sizeof( wxString ); - m_choiceUnits = new wxChoice( sbSizer1->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), m_choiceUnitsNChoices, m_choiceUnitsChoices, 0 ); + m_choiceUnits = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), m_choiceUnitsNChoices, m_choiceUnitsChoices, 0 ); m_choiceUnits->SetSelection( 0 ); - fgSizer->Add( m_choiceUnits, 0, wxEXPAND|wxALL, 5 ); + fgSizer->Add( m_choiceUnits, 0, wxEXPAND, 5 ); - m_lblPrecision = new wxStaticText( sbSizer1->GetStaticBox(), wxID_ANY, _("Precision:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_lblPrecision = new wxStaticText( this, wxID_ANY, _("Precision:"), wxDefaultPosition, wxDefaultSize, 0 ); m_lblPrecision->Wrap( -1 ); m_lblPrecision->SetToolTip( _("The number of values following the decimal separator") ); fgSizer->Add( m_lblPrecision, 0, wxALIGN_CENTER_VERTICAL, 5 ); - m_precision = new wxSpinCtrl( sbSizer1->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxSP_ARROW_KEYS, 2, 16, 6 ); + m_precision = new wxSpinCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxSP_ARROW_KEYS, 2, 16, 6 ); m_precision->SetToolTip( _("The number of values following the decimal separator") ); - fgSizer->Add( m_precision, 0, wxALL|wxEXPAND, 5 ); + fgSizer->Add( m_precision, 0, wxEXPAND, 5 ); - m_lblCompress = new wxStaticText( sbSizer1->GetStaticBox(), wxID_ANY, _("Compression format:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_lblCompress = new wxStaticText( this, wxID_ANY, _("Compression format:"), wxDefaultPosition, wxDefaultSize, 0 ); m_lblCompress->Wrap( -1 ); m_lblCompress->SetToolTip( _("Select the format to compress the output ODB++ files") ); - fgSizer->Add( m_lblCompress, 0, wxALIGN_CENTER_VERTICAL, 5 ); + fgSizer->Add( m_lblCompress, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); wxString m_choiceCompressChoices[] = { _("None"), _("ZIP"), _("TGZ") }; int m_choiceCompressNChoices = sizeof( m_choiceCompressChoices ) / sizeof( wxString ); - m_choiceCompress = new wxChoice( sbSizer1->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), m_choiceCompressNChoices, m_choiceCompressChoices, 0 ); + m_choiceCompress = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), m_choiceCompressNChoices, m_choiceCompressChoices, 0 ); m_choiceCompress->SetSelection( 1 ); - fgSizer->Add( m_choiceCompress, 0, wxALL|wxEXPAND, 5 ); + fgSizer->Add( m_choiceCompress, 0, wxEXPAND, 5 ); - sbSizer1->Add( fgSizer, 3, wxEXPAND|wxLEFT, 5 ); + bSizer3->Add( fgSizer, 3, wxEXPAND|wxRIGHT|wxLEFT, 5 ); + + wxBoxSizer* bSizer4; + bSizer4 = new wxBoxSizer( wxVERTICAL ); - bSizer3->Add( sbSizer1, 1, wxEXPAND|wxALL, 10 ); + bSizer4->Add( 0, 0, 1, wxEXPAND, 5 ); - bMainSizer->Add( bSizer3, 0, wxEXPAND, 10 ); + bSizer3->Add( bSizer4, 2, wxEXPAND, 5 ); + + + bMainSizer->Add( bSizer3, 0, wxEXPAND|wxALL, 5 ); m_stdButtons = new wxStdDialogButtonSizer(); m_stdButtonsOK = new wxButton( this, wxID_OK ); diff --git a/pcbnew/dialogs/dialog_export_odbpp_base.fbp b/pcbnew/dialogs/dialog_export_odbpp_base.fbp index f1af64a5b8..f532d4423f 100644 --- a/pcbnew/dialogs/dialog_export_odbpp_base.fbp +++ b/pcbnew/dialogs/dialog_export_odbpp_base.fbp @@ -47,7 +47,7 @@ 0 wxID_ANY - 380,265 + -1,-1 DIALOG_EXPORT_ODBPP_BASE -1,-1 @@ -75,7 +75,7 @@ protected 5 - wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxLEFT 0 1 @@ -278,8 +278,8 @@ - 10 - wxEXPAND + 5 + wxEXPAND|wxALL 0 @@ -287,413 +287,420 @@ wxHORIZONTAL none - 10 - wxEXPAND|wxALL - 1 - - wxID_ANY - File Format + 5 + wxEXPAND|wxRIGHT|wxLEFT + 3 + + 2 + wxBOTH + 1 + + 5 - sbSizer1 + fgSizer + wxFLEX_GROWMODE_SPECIFIED + none + 0 + 5 + + 5 + wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Units: + 0 + + 0 + + + 0 + + 1 + m_lblUnits + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + 5 + wxEXPAND + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + "Millimeters" "Inches" + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + -1,-1 + 1 + m_choiceUnits + 1 + + + protected + 1 + + Resizable + 0 + 1 + -1,-1 + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Precision: + 0 + + 0 + + + 0 + + 1 + m_lblPrecision + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + The number of values following the decimal separator + + + + -1 + + + + 5 + wxEXPAND + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + 6 + 16 + + 0 + + 2 + + 0 + + 1 + m_precision + 1 + + + protected + 1 + + Resizable + 1 + -1,-1 + wxSP_ARROW_KEYS + + 0 + The number of values following the decimal separator + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Compression format: + 0 + + 0 + + + 0 + + 1 + m_lblCompress + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Select the format to compress the output ODB++ files + + + + -1 + + + + 5 + wxEXPAND + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + "None" "ZIP" "TGZ" + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + -1,-1 + 1 + m_choiceCompress + 1 + + + protected + 1 + + Resizable + 1 + 1 + -1,-1 + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + onFormatChoice + + + + + + 5 + wxEXPAND + 2 + + + bSizer4 wxVERTICAL - 1 none 5 - wxEXPAND|wxLEFT - 3 - - 2 - wxBOTH - 0,1 - - 0 - - fgSizer - wxFLEX_GROWMODE_SPECIFIED - none - 0 - 0 - - 5 - wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - Units: - 0 - - 0 - - - 0 - - 1 - m_lblUnits - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - 5 - wxEXPAND|wxALL - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - "Millimeters" "Inches" - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - -1,-1 - 1 - m_choiceUnits - 1 - - - protected - 1 - - Resizable - 0 - 1 - -1,-1 - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - Precision: - 0 - - 0 - - - 0 - - 1 - m_lblPrecision - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - The number of values following the decimal separator - - - - -1 - - - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - 6 - 16 - - 0 - - 2 - - 0 - - 1 - m_precision - 1 - - - protected - 1 - - Resizable - 1 - -1,-1 - wxSP_ARROW_KEYS - - 0 - The number of values following the decimal separator - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - Compression format: - 0 - - 0 - - - 0 - - 1 - m_lblCompress - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - Select the format to compress the output ODB++ files - - - - -1 - - - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - "None" "ZIP" "TGZ" - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - -1,-1 - 1 - m_choiceCompress - 1 - - - protected - 1 - - Resizable - 1 - 1 - -1,-1 - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - onFormatChoice - - + wxEXPAND + 1 + + 0 + protected + 0 diff --git a/pcbnew/dialogs/dialog_export_odbpp_base.h b/pcbnew/dialogs/dialog_export_odbpp_base.h index ff40c3bf3a..aa6c167651 100644 --- a/pcbnew/dialogs/dialog_export_odbpp_base.h +++ b/pcbnew/dialogs/dialog_export_odbpp_base.h @@ -28,7 +28,6 @@ class STD_BITMAP_BUTTON; #include #include #include -#include #include ///////////////////////////////////////////////////////////////////////////