diff --git a/pcbnew/dialogs/dialog_export_idf_base.cpp b/pcbnew/dialogs/dialog_export_idf_base.cpp index 7198e2f32d..17c469fd0a 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 Nov 22 2017) +// C++ code generated with wxFormBuilder (version 3.9.0 Nov 1 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -14,53 +14,53 @@ DIALOG_EXPORT_IDF3_BASE::DIALOG_EXPORT_IDF3_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( wxDefaultSize, wxDefaultSize ); - + wxBoxSizer* bSizerIDFFile; bSizerIDFFile = new wxBoxSizer( wxVERTICAL ); - + m_txtBrdFile = new wxStaticText( this, wxID_ANY, _("File name:"), wxDefaultPosition, wxDefaultSize, 0 ); m_txtBrdFile->Wrap( -1 ); bSizerIDFFile->Add( m_txtBrdFile, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxTOP, 5 ); - - m_filePickerIDF = new wxFilePickerCtrl( this, wxID_ANY, wxEmptyString, _("Select an IDF export filename"), wxT("*.emn"), wxDefaultPosition, wxSize( 450,-1 ), wxFLP_OVERWRITE_PROMPT|wxFLP_SAVE|wxFLP_USE_TEXTCTRL ); + + m_filePickerIDF = new wxFilePickerCtrl( this, wxID_ANY, wxEmptyString, _("Select an IDF export filename"), _("*.emn"), wxDefaultPosition, wxSize( 450,-1 ), wxFLP_OVERWRITE_PROMPT|wxFLP_SAVE|wxFLP_USE_TEXTCTRL ); bSizerIDFFile->Add( m_filePickerIDF, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - + wxBoxSizer* bSizer2; bSizer2 = new wxBoxSizer( wxHORIZONTAL ); - + wxBoxSizer* bSizer3; bSizer3 = new wxBoxSizer( wxVERTICAL ); - + m_staticText2 = new wxStaticText( this, wxID_ANY, _("Grid reference point:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText2->Wrap( -1 ); bSizer3->Add( m_staticText2, 0, wxALL, 5 ); - + m_cbAutoAdjustOffset = new wxCheckBox( this, wxID_ANY, _("Adjust automatically"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); bSizer3->Add( m_cbAutoAdjustOffset, 0, wxALL, 5 ); - + wxBoxSizer* bSizer6; bSizer6 = new wxBoxSizer( wxHORIZONTAL ); - + m_staticText5 = new wxStaticText( this, wxID_ANY, _("Units:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText5->Wrap( -1 ); 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, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - + + bSizer3->Add( bSizer6, 1, wxEXPAND, 5 ); - + wxBoxSizer* bSizer4; bSizer4 = new wxBoxSizer( wxHORIZONTAL ); - + m_staticText3 = new wxStaticText( this, wxID_ANY, _("X position:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText3->Wrap( -1 ); bSizer4->Add( m_staticText3, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - + m_IDF_Xref = new TEXT_CTRL_EVAL( this, wxID_ANY, _("0"), wxDefaultPosition, wxDefaultSize, 0 ); #ifdef __WXGTK__ if ( !m_IDF_Xref->HasFlag( wxTE_MULTILINE ) ) @@ -71,17 +71,17 @@ DIALOG_EXPORT_IDF3_BASE::DIALOG_EXPORT_IDF3_BASE( wxWindow* parent, wxWindowID i m_IDF_Xref->SetMaxLength( 8 ); #endif bSizer4->Add( m_IDF_Xref, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - + + bSizer3->Add( bSizer4, 1, wxEXPAND, 5 ); - + wxBoxSizer* bSizer5; bSizer5 = new wxBoxSizer( wxHORIZONTAL ); - + m_staticText4 = new wxStaticText( this, wxID_ANY, _("Y position:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText4->Wrap( -1 ); bSizer5->Add( m_staticText4, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - + m_IDF_Yref = new TEXT_CTRL_EVAL( this, wxID_ANY, _("0"), wxDefaultPosition, wxDefaultSize, 0 ); #ifdef __WXGTK__ if ( !m_IDF_Yref->HasFlag( wxTE_MULTILINE ) ) @@ -92,42 +92,42 @@ DIALOG_EXPORT_IDF3_BASE::DIALOG_EXPORT_IDF3_BASE( wxWindow* parent, wxWindowID i m_IDF_Yref->SetMaxLength( 8 ); #endif bSizer5->Add( m_IDF_Yref, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - + + bSizer3->Add( bSizer5, 1, wxEXPAND, 5 ); - - + + bSizer2->Add( bSizer3, 1, wxEXPAND|wxLEFT, 5 ); - + wxString m_rbUnitSelectionChoices[] = { _("Millimeters"), _("Mils") }; int m_rbUnitSelectionNChoices = sizeof( m_rbUnitSelectionChoices ) / sizeof( wxString ); - m_rbUnitSelection = new wxRadioBox( this, wxID_ANY, _("Output Units:"), wxDefaultPosition, wxDefaultSize, m_rbUnitSelectionNChoices, m_rbUnitSelectionChoices, 1, wxRA_SPECIFY_COLS ); + m_rbUnitSelection = new wxRadioBox( this, wxID_ANY, _("Output Units"), wxDefaultPosition, wxDefaultSize, m_rbUnitSelectionNChoices, m_rbUnitSelectionChoices, 1, wxRA_SPECIFY_COLS ); m_rbUnitSelection->SetSelection( 0 ); bSizer2->Add( m_rbUnitSelection, 0, wxALL, 5 ); - - + + bSizer2->Add( 0, 0, 1, wxEXPAND, 5 ); - - + + bSizerIDFFile->Add( bSizer2, 1, wxEXPAND, 5 ); - + m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); bSizerIDFFile->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 ); - + m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); m_sdbSizer->AddButton( m_sdbSizerOK ); m_sdbSizerCancel = new wxButton( this, wxID_CANCEL ); m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); - + bSizerIDFFile->Add( m_sdbSizer, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); - - + + this->SetSizer( bSizerIDFFile ); this->Layout(); bSizerIDFFile->Fit( this ); - + this->Centre( wxBOTH ); } diff --git a/pcbnew/dialogs/dialog_export_idf_base.fbp b/pcbnew/dialogs/dialog_export_idf_base.fbp index 51f1c872df..5e89fb0044 100644 --- a/pcbnew/dialogs/dialog_export_idf_base.fbp +++ b/pcbnew/dialogs/dialog_export_idf_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -14,6 +14,8 @@ dialog_export_idf_base 1000 none + + 1 dialog_export_idf3_base @@ -24,6 +26,7 @@ 1 1 UI + 0 1 0 @@ -52,42 +55,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -1,-1 bSizerIDFFile @@ -126,6 +93,7 @@ 0 wxID_ANY File name: + 0 0 @@ -151,29 +119,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -239,30 +184,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -316,6 +237,7 @@ 0 wxID_ANY Grid reference point: + 0 0 @@ -341,29 +263,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -428,30 +327,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -496,6 +371,7 @@ 0 wxID_ANY Units: + 0 0 @@ -521,29 +397,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -608,30 +461,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -678,6 +507,7 @@ 0 wxID_ANY X position: + 0 0 @@ -703,29 +533,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -790,33 +597,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -863,6 +643,7 @@ 0 wxID_ANY Y position: + 0 0 @@ -888,29 +669,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -975,33 +733,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1041,7 +772,7 @@ 0 0 wxID_ANY - Output Units: + Output Units 1 0 @@ -1072,30 +803,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1166,29 +873,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -1207,14 +891,6 @@ m_sdbSizer protected - - - - - - - - diff --git a/pcbnew/dialogs/dialog_export_idf_base.h b/pcbnew/dialogs/dialog_export_idf_base.h index 956ec4f7ba..7cf3014499 100644 --- a/pcbnew/dialogs/dialog_export_idf_base.h +++ b/pcbnew/dialogs/dialog_export_idf_base.h @@ -1,12 +1,11 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 22 2017) +// C++ code generated with wxFormBuilder (version 3.9.0 Nov 1 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#ifndef __DIALOG_EXPORT_IDF_BASE_H__ -#define __DIALOG_EXPORT_IDF_BASE_H__ +#pragma once #include #include @@ -39,7 +38,7 @@ class TEXT_CTRL_EVAL; class DIALOG_EXPORT_IDF3_BASE : public DIALOG_SHIM { private: - + protected: wxStaticText* m_txtBrdFile; wxFilePickerCtrl* m_filePickerIDF; @@ -56,12 +55,11 @@ class DIALOG_EXPORT_IDF3_BASE : public DIALOG_SHIM wxStdDialogButtonSizer* m_sdbSizer; wxButton* m_sdbSizerOK; wxButton* m_sdbSizerCancel; - + public: - - DIALOG_EXPORT_IDF3_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Export IDFv3"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + + DIALOG_EXPORT_IDF3_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Export IDFv3"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_EXPORT_IDF3_BASE(); - + }; -#endif //__DIALOG_EXPORT_IDF_BASE_H__ diff --git a/pcbnew/dialogs/dialog_export_svg_base.cpp b/pcbnew/dialogs/dialog_export_svg_base.cpp index 4c04186b5b..cff866b92a 100644 --- a/pcbnew/dialogs/dialog_export_svg_base.cpp +++ b/pcbnew/dialogs/dialog_export_svg_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 30 2017) +// C++ code generated with wxFormBuilder (version 3.9.0 Nov 1 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -13,153 +13,151 @@ DIALOG_EXPORT_SVG_BASE::DIALOG_EXPORT_SVG_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,350 ), wxDefaultSize ); - + this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize ); + wxBoxSizer* bMainSizer; bMainSizer = new wxBoxSizer( wxVERTICAL ); - + wxBoxSizer* bSizer4; bSizer4 = new wxBoxSizer( wxHORIZONTAL ); - + m_staticTextDir = new wxStaticText( this, wxID_ANY, _("Output directory:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextDir->Wrap( -1 ); - bSizer4->Add( m_staticTextDir, 0, wxALL, 5 ); - + bSizer4->Add( m_staticTextDir, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); + m_outputDirectoryName = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_outputDirectoryName->SetToolTip( _("Enter a filename if you do not want to use default file names\nCan be used only when printing the current sheet") ); m_outputDirectoryName->SetMinSize( wxSize( 450,-1 ) ); - + bSizer4->Add( m_outputDirectoryName, 1, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); - - m_browseButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); - m_browseButton->SetMinSize( wxSize( 30,30 ) ); - - bSizer4->Add( m_browseButton, 0, 0, 5 ); - - + + m_browseButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); + bSizer4->Add( m_browseButton, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); + + bMainSizer->Add( bSizer4, 0, wxEXPAND|wxALL, 10 ); - + wxBoxSizer* bUpperSizer; bUpperSizer = new wxBoxSizer( wxHORIZONTAL ); - + wxStaticBoxSizer* sbLayersSizer; sbLayersSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Layers") ), wxHORIZONTAL ); - + wxBoxSizer* bSizerCopper; bSizerCopper = new wxBoxSizer( wxVERTICAL ); - + m_staticTextCopperLayers = new wxStaticText( sbLayersSizer->GetStaticBox(), wxID_ANY, _("Copper layers:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextCopperLayers->Wrap( -1 ); bSizerCopper->Add( m_staticTextCopperLayers, 0, wxRIGHT|wxLEFT, 5 ); - + wxArrayString m_CopperLayersListChoices; m_CopperLayersList = new wxCheckListBox( sbLayersSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_CopperLayersListChoices, 0 ); bSizerCopper->Add( m_CopperLayersList, 1, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - - + + sbLayersSizer->Add( bSizerCopper, 1, wxEXPAND, 5 ); - + wxBoxSizer* bSizerTech; bSizerTech = new wxBoxSizer( wxVERTICAL ); - + m_staticTextTechLayers = new wxStaticText( sbLayersSizer->GetStaticBox(), wxID_ANY, _("Technical layers:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextTechLayers->Wrap( -1 ); bSizerTech->Add( m_staticTextTechLayers, 0, wxRIGHT|wxLEFT, 5 ); - + wxArrayString m_TechnicalLayersListChoices; m_TechnicalLayersList = new wxCheckListBox( sbLayersSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_TechnicalLayersListChoices, 0 ); bSizerTech->Add( m_TechnicalLayersList, 1, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - - + + sbLayersSizer->Add( bSizerTech, 1, wxEXPAND, 5 ); - - + + bUpperSizer->Add( sbLayersSizer, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - + wxStaticBoxSizer* sbOptionsSizer; sbOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Options") ), wxVERTICAL ); - + wxBoxSizer* bSizer8; bSizer8 = new wxBoxSizer( wxHORIZONTAL ); - + m_penWidthLabel = new wxStaticText( sbOptionsSizer->GetStaticBox(), wxID_ANY, _("Default pen size:"), wxDefaultPosition, wxDefaultSize, 0 ); m_penWidthLabel->Wrap( -1 ); m_penWidthLabel->SetToolTip( _("Selection of the pen size used to draw items which have no pen size specified.") ); - + bSizer8->Add( m_penWidthLabel, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - + m_penWidthCtrl = new wxTextCtrl( sbOptionsSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); bSizer8->Add( m_penWidthCtrl, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - + m_penWidthUnits = new wxStaticText( sbOptionsSizer->GetStaticBox(), wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); m_penWidthUnits->Wrap( -1 ); bSizer8->Add( m_penWidthUnits, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 ); - - + + sbOptionsSizer->Add( bSizer8, 1, wxEXPAND, 5 ); - + wxString m_ModeColorOptionChoices[] = { _("Color"), _("Black and white") }; int m_ModeColorOptionNChoices = sizeof( m_ModeColorOptionChoices ) / sizeof( wxString ); m_ModeColorOption = new wxRadioBox( sbOptionsSizer->GetStaticBox(), wxID_ANY, _("Print Mode"), wxDefaultPosition, wxDefaultSize, m_ModeColorOptionNChoices, m_ModeColorOptionChoices, 1, wxRA_SPECIFY_COLS ); m_ModeColorOption->SetSelection( 1 ); m_ModeColorOption->SetToolTip( _("Choose if you want to draw the sheet like it appears on screen,\nor in black and white mode, better to print it when using black and white printers") ); - + sbOptionsSizer->Add( m_ModeColorOption, 0, wxEXPAND|wxALL, 5 ); - + wxString m_rbSvgPageSizeOptChoices[] = { _("Page with frame and title block"), _("Current page size"), _("Board area only") }; int m_rbSvgPageSizeOptNChoices = sizeof( m_rbSvgPageSizeOptChoices ) / sizeof( wxString ); m_rbSvgPageSizeOpt = new wxRadioBox( sbOptionsSizer->GetStaticBox(), wxID_ANY, _("SVG Page Size"), wxDefaultPosition, wxDefaultSize, m_rbSvgPageSizeOptNChoices, m_rbSvgPageSizeOptChoices, 1, wxRA_SPECIFY_COLS ); m_rbSvgPageSizeOpt->SetSelection( 0 ); sbOptionsSizer->Add( m_rbSvgPageSizeOpt, 0, wxEXPAND|wxALL, 5 ); - + m_PrintBoardEdgesCtrl = new wxCheckBox( sbOptionsSizer->GetStaticBox(), wxID_ANY, _("Print board edges"), wxDefaultPosition, wxDefaultSize, 0 ); - m_PrintBoardEdgesCtrl->SetValue(true); + m_PrintBoardEdgesCtrl->SetValue(true); m_PrintBoardEdgesCtrl->SetToolTip( _("Print (or not) the edges layer on others layers") ); - + sbOptionsSizer->Add( m_PrintBoardEdgesCtrl, 0, wxALL, 5 ); - + m_printMirrorOpt = new wxCheckBox( sbOptionsSizer->GetStaticBox(), wxID_ANY, _("Print mirrored"), wxDefaultPosition, wxDefaultSize, 0 ); m_printMirrorOpt->SetToolTip( _("Print the layer(s) horizontally mirrored") ); - + sbOptionsSizer->Add( m_printMirrorOpt, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); - + wxString m_rbFileOptChoices[] = { _("One file per layer"), _("All layers in a single file") }; int m_rbFileOptNChoices = sizeof( m_rbFileOptChoices ) / sizeof( wxString ); m_rbFileOpt = new wxRadioBox( sbOptionsSizer->GetStaticBox(), wxID_ANY, _("Pagination"), wxDefaultPosition, wxDefaultSize, m_rbFileOptNChoices, m_rbFileOptChoices, 1, wxRA_SPECIFY_COLS ); m_rbFileOpt->SetSelection( 0 ); sbOptionsSizer->Add( m_rbFileOpt, 0, wxALL|wxEXPAND, 5 ); - - + + bUpperSizer->Add( sbOptionsSizer, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - + + bMainSizer->Add( bUpperSizer, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - + wxBoxSizer* bSizer5; bSizer5 = new wxBoxSizer( wxVERTICAL ); - + m_messagesPanel = new WX_HTML_REPORT_PANEL( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_messagesPanel->SetMinSize( wxSize( 300,150 ) ); - + bSizer5->Add( m_messagesPanel, 1, wxEXPAND | wxALL, 5 ); - - + + bMainSizer->Add( bSizer5, 1, wxEXPAND, 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(); - + bMainSizer->Add( m_sdbSizer1, 0, wxALL|wxEXPAND, 5 ); - - + + this->SetSizer( bMainSizer ); this->Layout(); bMainSizer->Fit( this ); - + // Connect Events m_browseButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXPORT_SVG_BASE::OnOutputDirectoryBrowseClicked ), NULL, this ); m_sdbSizer1OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXPORT_SVG_BASE::OnButtonPlot ), NULL, this ); @@ -170,5 +168,5 @@ DIALOG_EXPORT_SVG_BASE::~DIALOG_EXPORT_SVG_BASE() // Disconnect Events m_browseButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXPORT_SVG_BASE::OnOutputDirectoryBrowseClicked ), NULL, this ); m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXPORT_SVG_BASE::OnButtonPlot ), NULL, this ); - + } diff --git a/pcbnew/dialogs/dialog_export_svg_base.fbp b/pcbnew/dialogs/dialog_export_svg_base.fbp index e0649131d0..2244d81b5c 100644 --- a/pcbnew/dialogs/dialog_export_svg_base.fbp +++ b/pcbnew/dialogs/dialog_export_svg_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -14,6 +14,8 @@ dialog_export_svg_base 1000 none + + 1 dialog_export_svg @@ -24,6 +26,7 @@ 1 1 UI + 0 1 0 @@ -41,7 +44,7 @@ 0 wxID_ANY - -1,350 + -1,-1 DIALOG_EXPORT_SVG_BASE -1,-1 @@ -52,42 +55,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bMainSizer @@ -104,7 +71,7 @@ none 5 - wxALL + wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT 0 1 @@ -135,6 +102,7 @@ 0 wxID_ANY Output directory: + 0 0 @@ -160,29 +128,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -247,38 +192,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - + wxALIGN_CENTER_VERTICAL|wxLEFT 0 1 @@ -289,6 +207,7 @@ + 0 @@ -298,6 +217,7 @@ 1 1 + 0 0 @@ -311,15 +231,16 @@ 0 0 - wxID_ANY MyButton + + 0 0 0 - 30,30 + -1,-1 1 m_browseButton 1 @@ -328,11 +249,12 @@ protected 1 + + Resizable - 1 - wxBU_AUTODRAW + ; forward_declare 0 @@ -344,29 +266,6 @@ OnOutputDirectoryBrowseClicked - - - - - - - - - - - - - - - - - - - - - - - @@ -392,7 +291,6 @@ wxHORIZONTAL 1 none - 5 wxEXPAND @@ -435,6 +333,7 @@ 0 wxID_ANY Copper layers: + 0 0 @@ -460,29 +359,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -546,32 +422,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -618,6 +468,7 @@ 0 wxID_ANY Technical layers: + 0 0 @@ -643,29 +494,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -729,32 +557,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -773,7 +575,6 @@ wxVERTICAL 1 none - 5 wxEXPAND @@ -816,6 +617,7 @@ 0 wxID_ANY Default pen size: + 0 0 @@ -841,29 +643,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -928,33 +707,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -990,6 +742,7 @@ 0 wxID_ANY mm + 0 0 @@ -1015,29 +768,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -1106,30 +836,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1196,30 +902,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1284,30 +966,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1372,30 +1030,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1462,30 +1096,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1556,29 +1166,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - @@ -1599,14 +1186,7 @@ m_sdbSizer1 protected - - - - - OnButtonPlot - - diff --git a/pcbnew/dialogs/dialog_export_svg_base.h b/pcbnew/dialogs/dialog_export_svg_base.h index 20ca526417..2ec8cf9d16 100644 --- a/pcbnew/dialogs/dialog_export_svg_base.h +++ b/pcbnew/dialogs/dialog_export_svg_base.h @@ -1,12 +1,11 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Dec 30 2017) +// C++ code generated with wxFormBuilder (version 3.9.0 Nov 1 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#ifndef __DIALOG_EXPORT_SVG_BASE_H__ -#define __DIALOG_EXPORT_SVG_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 @@ -42,7 +41,7 @@ class WX_HTML_REPORT_PANEL; class DIALOG_EXPORT_SVG_BASE : public DIALOG_SHIM { private: - + protected: wxStaticText* m_staticTextDir; wxTextCtrl* m_outputDirectoryName; @@ -63,17 +62,16 @@ class DIALOG_EXPORT_SVG_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 OnButtonPlot( wxCommandEvent& event ) { event.Skip(); } - - + + public: - - DIALOG_EXPORT_SVG_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Export SVG File"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + + DIALOG_EXPORT_SVG_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Export SVG File"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_EXPORT_SVG_BASE(); - + }; -#endif //__DIALOG_EXPORT_SVG_BASE_H__ diff --git a/pcbnew/dialogs/dialog_export_vrml_base.cpp b/pcbnew/dialogs/dialog_export_vrml_base.cpp index d212be560f..71078e17f3 100644 --- a/pcbnew/dialogs/dialog_export_vrml_base.cpp +++ b/pcbnew/dialogs/dialog_export_vrml_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 22 2017) +// C++ code generated with wxFormBuilder (version 3.9.0 Nov 1 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -12,64 +12,66 @@ DIALOG_EXPORT_3DFILE_BASE::DIALOG_EXPORT_3DFILE_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( wxDefaultSize, wxDefaultSize ); - + wxBoxSizer* bSizer1; bSizer1 = new wxBoxSizer( wxVERTICAL ); - + wxBoxSizer* bUpperSizer; bUpperSizer = new wxBoxSizer( wxVERTICAL ); - + m_staticText1 = new wxStaticText( this, wxID_ANY, _("File name:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText1->Wrap( -1 ); bUpperSizer->Add( m_staticText1, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - - m_filePicker = new wxFilePickerCtrl( this, wxID_ANY, wxEmptyString, _("Save VRML Board File"), wxT("*.wrl"), wxDefaultPosition, wxDefaultSize, wxFLP_SAVE|wxFLP_USE_TEXTCTRL ); + + m_filePicker = new wxFilePickerCtrl( this, wxID_ANY, wxEmptyString, _("Save VRML Board File"), _("*.wrl"), wxDefaultPosition, wxDefaultSize, wxFLP_SAVE|wxFLP_USE_TEXTCTRL ); + m_filePicker->SetMinSize( wxSize( 450,-1 ) ); + bUpperSizer->Add( m_filePicker, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - + m_staticText3 = new wxStaticText( this, wxID_ANY, _("Footprint 3D model path:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText3->Wrap( -1 ); bUpperSizer->Add( m_staticText3, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_SubdirNameCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); bUpperSizer->Add( m_SubdirNameCtrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - + + bSizer1->Add( bUpperSizer, 0, wxALL|wxEXPAND, 5 ); - + wxBoxSizer* bSizer12; bSizer12 = new wxBoxSizer( wxHORIZONTAL ); - + wxBoxSizer* bSizer5; bSizer5 = new wxBoxSizer( wxVERTICAL ); - + m_panel1 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizer9; bSizer9 = new wxBoxSizer( wxVERTICAL ); - + m_staticText6 = new wxStaticText( m_panel1, wxID_ANY, _("Grid reference point:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText6->Wrap( -1 ); bSizer9->Add( m_staticText6, 0, wxALL, 5 ); - + wxFlexGridSizer* fgSizerOptions; fgSizerOptions = new wxFlexGridSizer( 0, 2, 0, 0 ); fgSizerOptions->AddGrowableCol( 1 ); fgSizerOptions->SetFlexibleDirection( wxBOTH ); fgSizerOptions->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_staticText61 = new wxStaticText( m_panel1, wxID_ANY, _("Units:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText61->Wrap( -1 ); fgSizerOptions->Add( m_staticText61, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - + wxString m_VRML_RefUnitChoiceChoices[] = { _("mm"), _("inch") }; int m_VRML_RefUnitChoiceNChoices = sizeof( m_VRML_RefUnitChoiceChoices ) / sizeof( wxString ); m_VRML_RefUnitChoice = new wxChoice( m_panel1, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_VRML_RefUnitChoiceNChoices, m_VRML_RefUnitChoiceChoices, 0 ); m_VRML_RefUnitChoice->SetSelection( 0 ); fgSizerOptions->Add( m_VRML_RefUnitChoice, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); - + m_staticText4 = new wxStaticText( m_panel1, wxID_ANY, _("X:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText4->Wrap( -1 ); fgSizerOptions->Add( m_staticText4, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - + m_VRML_Xref = new wxTextCtrl( m_panel1, wxID_ANY, _("0"), wxDefaultPosition, wxDefaultSize, 0 ); #ifdef __WXGTK__ if ( !m_VRML_Xref->HasFlag( wxTE_MULTILINE ) ) @@ -80,11 +82,11 @@ DIALOG_EXPORT_3DFILE_BASE::DIALOG_EXPORT_3DFILE_BASE( wxWindow* parent, wxWindow m_VRML_Xref->SetMaxLength( 8 ); #endif fgSizerOptions->Add( m_VRML_Xref, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); - + m_staticText5 = new wxStaticText( m_panel1, wxID_ANY, _("Y:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText5->Wrap( -1 ); fgSizerOptions->Add( m_staticText5, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - + m_VRML_Yref = new wxTextCtrl( m_panel1, wxID_ANY, _("0"), wxDefaultPosition, wxDefaultSize, 0 ); #ifdef __WXGTK__ if ( !m_VRML_Yref->HasFlag( wxTE_MULTILINE ) ) @@ -95,68 +97,68 @@ DIALOG_EXPORT_3DFILE_BASE::DIALOG_EXPORT_3DFILE_BASE( wxWindow* parent, wxWindow m_VRML_Yref->SetMaxLength( 8 ); #endif fgSizerOptions->Add( m_VRML_Yref, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); - - + + bSizer9->Add( fgSizerOptions, 1, wxEXPAND, 5 ); - - + + m_panel1->SetSizer( bSizer9 ); m_panel1->Layout(); bSizer9->Fit( m_panel1 ); bSizer5->Add( m_panel1, 1, wxEXPAND | wxALL, 5 ); - - + + bSizer12->Add( bSizer5, 1, wxEXPAND, 5 ); - + wxString m_rbSelectUnitsChoices[] = { _("mm"), _("meter"), _("0.1 Inch"), _("Inch") }; int m_rbSelectUnitsNChoices = sizeof( m_rbSelectUnitsChoices ) / sizeof( wxString ); - m_rbSelectUnits = new wxRadioBox( this, wxID_ANY, _("Output Units:"), wxDefaultPosition, wxDefaultSize, m_rbSelectUnitsNChoices, m_rbSelectUnitsChoices, 1, wxRA_SPECIFY_COLS ); + m_rbSelectUnits = new wxRadioBox( this, wxID_ANY, _("Output Units"), wxDefaultPosition, wxDefaultSize, m_rbSelectUnitsNChoices, m_rbSelectUnitsChoices, 1, wxRA_SPECIFY_COLS ); m_rbSelectUnits->SetSelection( 0 ); bSizer12->Add( m_rbSelectUnits, 1, wxALL|wxEXPAND, 5 ); - - + + bSizer1->Add( bSizer12, 0, wxEXPAND, 5 ); - + wxBoxSizer* bLowerSizer; bLowerSizer = new wxBoxSizer( wxHORIZONTAL ); - + wxBoxSizer* bSizer4; bSizer4 = new wxBoxSizer( wxVERTICAL ); - + m_cbCopyFiles = new wxCheckBox( this, wxID_ANY, _("Copy 3D model files to 3D model path"), wxDefaultPosition, wxDefaultSize, 0 ); - m_cbCopyFiles->SetValue(true); + m_cbCopyFiles->SetValue(true); bSizer4->Add( m_cbCopyFiles, 0, wxALL, 5 ); - + m_cbUseRelativePaths = new wxCheckBox( this, ID_USE_ABS_PATH, _("Use relative paths to model files in board VRML file"), wxDefaultPosition, wxDefaultSize, 0 ); m_cbUseRelativePaths->SetToolTip( _("Use paths for model files in board VRML file relative to the vrml file") ); - + bSizer4->Add( m_cbUseRelativePaths, 0, wxALL, 5 ); - + m_cbPlainPCB = new wxCheckBox( this, wxID_ANY, _("Plain PCB (no copper or silk)"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer4->Add( m_cbPlainPCB, 0, wxALL, 5 ); - - + + bLowerSizer->Add( bSizer4, 2, wxEXPAND, 5 ); - - + + bSizer1->Add( bLowerSizer, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); - - + + bSizer1->Add( 0, 0, 1, wxEXPAND, 5 ); - + m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); bSizer1->Add( m_staticline1, 0, 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(); - + bSizer1->Add( m_sdbSizer1, 0, wxEXPAND|wxALL, 5 ); - - + + this->SetSizer( bSizer1 ); this->Layout(); bSizer1->Fit( this ); diff --git a/pcbnew/dialogs/dialog_export_vrml_base.fbp b/pcbnew/dialogs/dialog_export_vrml_base.fbp index 0e817b6bfc..ff798e3402 100644 --- a/pcbnew/dialogs/dialog_export_vrml_base.fbp +++ b/pcbnew/dialogs/dialog_export_vrml_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -14,6 +14,8 @@ dialog_export_vrml_base 1000 none + + 1 dialog_export_vrml @@ -24,6 +26,7 @@ 1 1 UI + 0 1 0 @@ -52,42 +55,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -1,-1 bSizer1 @@ -135,6 +102,7 @@ 0 wxID_ANY File name: + 0 0 @@ -160,29 +128,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -223,7 +168,7 @@ Save VRML Board File 0 - -1,-1 + 450,-1 1 m_filePicker 1 @@ -248,30 +193,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -307,6 +228,7 @@ 0 wxID_ANY Footprint 3D model path: + 0 0 @@ -332,29 +254,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -419,33 +318,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -523,29 +395,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - bSizer9 @@ -584,6 +433,7 @@ 0 wxID_ANY Grid reference point: + 0 0 @@ -609,29 +459,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -683,6 +510,7 @@ 0 wxID_ANY Units: + 0 0 @@ -708,29 +536,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -795,30 +600,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -854,6 +635,7 @@ 0 wxID_ANY X: + 0 0 @@ -879,29 +661,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -966,33 +725,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1028,6 +760,7 @@ 0 wxID_ANY Y: + 0 0 @@ -1053,29 +786,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -1140,33 +850,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1209,7 +892,7 @@ 0 0 wxID_ANY - Output Units: + Output Units 1 0 @@ -1240,30 +923,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1348,30 +1007,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1436,30 +1071,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1524,30 +1135,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1620,29 +1207,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -1661,14 +1225,6 @@ m_sdbSizer1 protected - - - - - - - - diff --git a/pcbnew/dialogs/dialog_export_vrml_base.h b/pcbnew/dialogs/dialog_export_vrml_base.h index a38627f05b..0c5ecf0cda 100644 --- a/pcbnew/dialogs/dialog_export_vrml_base.h +++ b/pcbnew/dialogs/dialog_export_vrml_base.h @@ -1,12 +1,11 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 22 2017) +// C++ code generated with wxFormBuilder (version 3.9.0 Nov 1 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#ifndef __DIALOG_EXPORT_VRML_BASE_H__ -#define __DIALOG_EXPORT_VRML_BASE_H__ +#pragma once #include #include @@ -37,13 +36,13 @@ class DIALOG_EXPORT_3DFILE_BASE : public DIALOG_SHIM { private: - + protected: enum { ID_USE_ABS_PATH = 1000 }; - + wxStaticText* m_staticText1; wxFilePickerCtrl* m_filePicker; wxStaticText* m_staticText3; @@ -64,12 +63,11 @@ class DIALOG_EXPORT_3DFILE_BASE : public DIALOG_SHIM wxStdDialogButtonSizer* m_sdbSizer1; wxButton* m_sdbSizer1OK; wxButton* m_sdbSizer1Cancel; - + public: - - DIALOG_EXPORT_3DFILE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("VRML Export Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + + DIALOG_EXPORT_3DFILE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("VRML Export Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_EXPORT_3DFILE_BASE(); - + }; -#endif //__DIALOG_EXPORT_VRML_BASE_H__ diff --git a/pcbnew/dialogs/dialog_gen_footprint_position_file_base.cpp b/pcbnew/dialogs/dialog_gen_footprint_position_file_base.cpp index 1ad15aade8..73b05c10e3 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 Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.9.0 Nov 1 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -34,8 +34,6 @@ DIALOG_GEN_FOOTPRINT_POSITION_BASE::DIALOG_GEN_FOOTPRINT_POSITION_BASE( wxWindow bSizerdirBrowse->Add( m_outputDirectoryName, 1, wxALIGN_CENTER_VERTICAL, 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, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); @@ -102,6 +100,7 @@ DIALOG_GEN_FOOTPRINT_POSITION_BASE::DIALOG_GEN_FOOTPRINT_POSITION_BASE( wxWindow this->SetSizer( m_MainSizer ); this->Layout(); + m_MainSizer->Fit( this ); this->Centre( wxBOTH ); diff --git a/pcbnew/dialogs/dialog_gen_footprint_position_file_base.fbp b/pcbnew/dialogs/dialog_gen_footprint_position_file_base.fbp index 41db1bc567..7c78c88806 100644 --- a/pcbnew/dialogs/dialog_gen_footprint_position_file_base.fbp +++ b/pcbnew/dialogs/dialog_gen_footprint_position_file_base.fbp @@ -14,6 +14,7 @@ dialog_gen_footprint_position_file_base 1000 none + 1 dialog_gen_footprint_positions_base @@ -25,6 +26,7 @@ 1 1 UI + 0 1 0 @@ -45,7 +47,7 @@ -1,-1 DIALOG_GEN_FOOTPRINT_POSITION_BASE - 520,450 + -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h Generate Footprint Position Files @@ -214,6 +216,7 @@ + 0 @@ -246,7 +249,7 @@ 0 - 30,28 + -1,-1 1 m_browseButton 1 diff --git a/pcbnew/dialogs/dialog_gen_footprint_position_file_base.h b/pcbnew/dialogs/dialog_gen_footprint_position_file_base.h index d23238913c..c719c2e34e 100644 --- a/pcbnew/dialogs/dialog_gen_footprint_position_file_base.h +++ b/pcbnew/dialogs/dialog_gen_footprint_position_file_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.9.0 Nov 1 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -69,7 +69,7 @@ class DIALOG_GEN_FOOTPRINT_POSITION_BASE : public DIALOG_SHIM 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( 520,450 ), 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(); }; diff --git a/pcbnew/dialogs/dialog_gendrill_base.cpp b/pcbnew/dialogs/dialog_gendrill_base.cpp index 3b0d30b3d8..ef44fa31c5 100644 --- a/pcbnew/dialogs/dialog_gendrill_base.cpp +++ b/pcbnew/dialogs/dialog_gendrill_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.9.0 Nov 1 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -24,14 +24,10 @@ DIALOG_GENDRILL_BASE::DIALOG_GENDRILL_BASE( wxWindow* parent, wxWindowID id, con bupperSizer->Add( staticTextOutputDir, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 10 ); m_outputDirectoryName = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_outputDirectoryName->SetMinSize( wxSize( -1,22 ) ); - bupperSizer->Add( m_outputDirectoryName, 1, wxALIGN_CENTER_VERTICAL|wxLEFT, 0 ); m_browseButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); - m_browseButton->SetMinSize( wxSize( 30,28 ) ); - - bupperSizer->Add( m_browseButton, 0, wxLEFT|wxRIGHT, 7 ); + bupperSizer->Add( m_browseButton, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 7 ); bMainSizer->Add( bupperSizer, 0, wxEXPAND|wxTOP, 10 ); diff --git a/pcbnew/dialogs/dialog_gendrill_base.fbp b/pcbnew/dialogs/dialog_gendrill_base.fbp index 22c87c90f6..92722f7547 100644 --- a/pcbnew/dialogs/dialog_gendrill_base.fbp +++ b/pcbnew/dialogs/dialog_gendrill_base.fbp @@ -14,6 +14,7 @@ dialog_gendrill_base 1000 none + 1 dialog_gendrill_base @@ -25,6 +26,7 @@ 1 1 UI + 0 0 0 @@ -167,7 +169,7 @@ 0 0 - -1,22 + -1,-1 1 m_outputDirectoryName 1 @@ -195,7 +197,7 @@ 7 - wxLEFT|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT 0 1 @@ -206,6 +208,7 @@ + 0 @@ -238,7 +241,7 @@ 0 - 30,28 + -1,-1 1 m_browseButton 1 @@ -1873,6 +1876,7 @@ + 0 diff --git a/pcbnew/dialogs/dialog_gendrill_base.h b/pcbnew/dialogs/dialog_gendrill_base.h index 7dc718f948..cc7682ea55 100644 --- a/pcbnew/dialogs/dialog_gendrill_base.h +++ b/pcbnew/dialogs/dialog_gendrill_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.9.0 Nov 1 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/pcbnew/dialogs/dialog_get_footprint_by_name_base.cpp b/pcbnew/dialogs/dialog_get_footprint_by_name_base.cpp index 74950e60f3..58b595800a 100644 --- a/pcbnew/dialogs/dialog_get_footprint_by_name_base.cpp +++ b/pcbnew/dialogs/dialog_get_footprint_by_name_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.9.0 Nov 1 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -27,23 +27,23 @@ DIALOG_GET_FOOTPRINT_BY_NAME_BASE::DIALOG_GET_FOOTPRINT_BY_NAME_BASE( wxWindow* m_staticTextRef = new wxStaticText( this, wxID_ANY, _("Reference designator:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextRef->Wrap( -1 ); - gbSizer1->Add( m_staticTextRef, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + gbSizer1->Add( m_staticTextRef, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); m_SearchTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 200,-1 ), 0 ); gbSizer1->Add( m_SearchTextCtrl, wxGBPosition( 0, 1 ), wxGBSpan( 1, 1 ), wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); m_multipleHint = new wxStaticText( this, wxID_ANY, _("(specify multiple items separated by spaces for successive placement)"), wxDefaultPosition, wxDefaultSize, 0 ); m_multipleHint->Wrap( -1 ); - gbSizer1->Add( m_multipleHint, wxGBPosition( 1, 0 ), wxGBSpan( 1, 2 ), wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); + gbSizer1->Add( m_multipleHint, wxGBPosition( 1, 0 ), wxGBSpan( 1, 2 ), wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); m_staticTextRef1 = new wxStaticText( this, wxID_ANY, _("Available:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextRef1->Wrap( -1 ); - gbSizer1->Add( m_staticTextRef1, wxGBPosition( 3, 0 ), wxGBSpan( 1, 1 ), wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + gbSizer1->Add( m_staticTextRef1, wxGBPosition( 3, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); wxArrayString m_choiceFpListChoices; m_choiceFpList = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceFpListChoices, 0 ); m_choiceFpList->SetSelection( 0 ); - gbSizer1->Add( m_choiceFpList, wxGBPosition( 3, 1 ), wxGBSpan( 1, 1 ), wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + gbSizer1->Add( m_choiceFpList, wxGBPosition( 3, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 ); bSizerUpper->Add( gbSizer1, 1, wxEXPAND|wxALL, 5 ); diff --git a/pcbnew/dialogs/dialog_get_footprint_by_name_base.fbp b/pcbnew/dialogs/dialog_get_footprint_by_name_base.fbp index 3f59635df7..2892c134ae 100644 --- a/pcbnew/dialogs/dialog_get_footprint_by_name_base.fbp +++ b/pcbnew/dialogs/dialog_get_footprint_by_name_base.fbp @@ -14,6 +14,7 @@ dialog_get_footprint_by_name_base 1000 none + 1 dialog_get_footprint_by_name @@ -25,6 +26,7 @@ 1 1 UI + 0 0 0 @@ -87,7 +89,7 @@ 5 1 0 - wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT 0 1 @@ -218,7 +220,7 @@ 5 2 0 - wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND + wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP 1 1 @@ -282,7 +284,7 @@ 5 1 0 - wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT 3 1 @@ -346,7 +348,7 @@ 5 1 1 - wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND 3 1 diff --git a/pcbnew/dialogs/dialog_get_footprint_by_name_base.h b/pcbnew/dialogs/dialog_get_footprint_by_name_base.h index d6196b8071..0f08462df7 100644 --- a/pcbnew/dialogs/dialog_get_footprint_by_name_base.h +++ b/pcbnew/dialogs/dialog_get_footprint_by_name_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.9.0 Nov 1 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/pcbnew/dialogs/dialog_import_settings_base.cpp b/pcbnew/dialogs/dialog_import_settings_base.cpp index 303c2caa53..30e04dfac2 100644 --- a/pcbnew/dialogs/dialog_import_settings_base.cpp +++ b/pcbnew/dialogs/dialog_import_settings_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.9.0 Nov 1 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -30,9 +30,7 @@ DIALOG_IMPORT_SETTINGS_BASE::DIALOG_IMPORT_SETTINGS_BASE( wxWindow* parent, wxWi bUpperSizer->Add( m_filePathCtrl, 1, wxEXPAND|wxTOP|wxBOTTOM, 5 ); m_browseButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); - m_browseButton->SetMinSize( wxSize( 29,29 ) ); - - bUpperSizer->Add( m_browseButton, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); + bUpperSizer->Add( m_browseButton, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); m_MainSizer->Add( bUpperSizer, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); @@ -76,7 +74,7 @@ DIALOG_IMPORT_SETTINGS_BASE::DIALOG_IMPORT_SETTINGS_BASE( wxWindow* parent, wxWi bRightCol = new wxBoxSizer( wxVERTICAL ); m_selectAllButton = new wxButton( this, wxID_ANY, _("Select All"), wxDefaultPosition, wxDefaultSize, 0 ); - bRightCol->Add( m_selectAllButton, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxALIGN_RIGHT, 10 ); + bRightCol->Add( m_selectAllButton, 0, wxALIGN_CENTER|wxALL, 10 ); bMiddleSizer->Add( bRightCol, 1, wxEXPAND|wxALL, 20 ); diff --git a/pcbnew/dialogs/dialog_import_settings_base.fbp b/pcbnew/dialogs/dialog_import_settings_base.fbp index e6eb75394e..92e93c16ea 100644 --- a/pcbnew/dialogs/dialog_import_settings_base.fbp +++ b/pcbnew/dialogs/dialog_import_settings_base.fbp @@ -14,6 +14,7 @@ dialog_import_settings_base 1000 none + 1 dialog_import_settings_base @@ -25,6 +26,7 @@ 1 1 UI + 0 1 0 @@ -194,7 +196,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT 0 1 @@ -205,6 +207,7 @@ + 0 @@ -237,7 +240,7 @@ 0 - 29,29 + -1,-1 1 m_browseButton 1 @@ -814,8 +817,8 @@ none 10 - wxALIGN_CENTER_VERTICAL|wxALL|wxALIGN_RIGHT - 1 + wxALIGN_CENTER|wxALL + 0 1 1 @@ -825,6 +828,7 @@ + 0 diff --git a/pcbnew/dialogs/dialog_import_settings_base.h b/pcbnew/dialogs/dialog_import_settings_base.h index 03bb61e03f..96b6f6964f 100644 --- a/pcbnew/dialogs/dialog_import_settings_base.h +++ b/pcbnew/dialogs/dialog_import_settings_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.9.0 Nov 1 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp b/pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp index 2ef7f6f223..bef3e70b2a 100644 --- a/pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp +++ b/pcbnew/dialogs/dialog_non_copper_zones_properties_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.9.0 Nov 1 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -27,7 +27,7 @@ DIALOG_NONCOPPER_ZONES_PROPERTIES_BASE::DIALOG_NONCOPPER_ZONES_PROPERTIES_BASE( bSizerLeft->Add( m_staticTextLayerSelection, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); m_layers = new wxDataViewListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxDV_NO_HEADER|wxBORDER_SIMPLE ); - m_layers->SetMinSize( wxSize( -1,200 ) ); + m_layers->SetMinSize( wxSize( 100,-1 ) ); bSizerLeft->Add( m_layers, 1, wxALL|wxEXPAND, 5 ); @@ -205,6 +205,7 @@ DIALOG_NONCOPPER_ZONES_PROPERTIES_BASE::DIALOG_NONCOPPER_ZONES_PROPERTIES_BASE( this->SetSizer( m_MainSizer ); this->Layout(); + m_MainSizer->Fit( this ); this->Centre( wxBOTH ); diff --git a/pcbnew/dialogs/dialog_non_copper_zones_properties_base.fbp b/pcbnew/dialogs/dialog_non_copper_zones_properties_base.fbp index 46fe9cce48..540c5decb1 100644 --- a/pcbnew/dialogs/dialog_non_copper_zones_properties_base.fbp +++ b/pcbnew/dialogs/dialog_non_copper_zones_properties_base.fbp @@ -14,6 +14,7 @@ dialog_non_copper_zones_properties_base 1000 none + 1 dialog_non_copper_zones_properties_base @@ -25,6 +26,7 @@ 1 1 UI + 0 1 0 @@ -45,7 +47,7 @@ DIALOG_NONCOPPER_ZONES_PROPERTIES_BASE - 595,491 + -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h Non Copper Zones Properties @@ -152,7 +154,7 @@ 0 wxID_ANY - -1,200 + 100,-1 m_layers protected diff --git a/pcbnew/dialogs/dialog_non_copper_zones_properties_base.h b/pcbnew/dialogs/dialog_non_copper_zones_properties_base.h index 0a5a18d44c..6d64d8ea18 100644 --- a/pcbnew/dialogs/dialog_non_copper_zones_properties_base.h +++ b/pcbnew/dialogs/dialog_non_copper_zones_properties_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.9.0 Nov 1 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -80,7 +80,7 @@ class DIALOG_NONCOPPER_ZONES_PROPERTIES_BASE : public DIALOG_SHIM public: - DIALOG_NONCOPPER_ZONES_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Non Copper Zones Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 595,491 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxFULL_REPAINT_ON_RESIZE|wxBORDER_SUNKEN ); + DIALOG_NONCOPPER_ZONES_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Non Copper Zones Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxFULL_REPAINT_ON_RESIZE|wxBORDER_SUNKEN ); ~DIALOG_NONCOPPER_ZONES_PROPERTIES_BASE(); }; diff --git a/pcbnew/dialogs/dialog_unused_pad_layers.fbp b/pcbnew/dialogs/dialog_unused_pad_layers.fbp index 60b27316b8..b209672a3e 100644 --- a/pcbnew/dialogs/dialog_unused_pad_layers.fbp +++ b/pcbnew/dialogs/dialog_unused_pad_layers.fbp @@ -14,6 +14,7 @@ dialog_unused_pad_layers_base 1000 none + 1 DIALOG_UNUSED_PAD_LAYERS_BASE @@ -25,6 +26,7 @@ 1 1 UI + 0 0 0 @@ -45,7 +47,7 @@ -1,-1 DIALOG_UNUSED_PAD_LAYERS_BASE - 602,321 + -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h Unused Pad Layers diff --git a/pcbnew/dialogs/dialog_unused_pad_layers_base.cpp b/pcbnew/dialogs/dialog_unused_pad_layers_base.cpp index 697bf73b2c..69c446aa08 100644 --- a/pcbnew/dialogs/dialog_unused_pad_layers_base.cpp +++ b/pcbnew/dialogs/dialog_unused_pad_layers_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.9.0 Jul 27 2020) +// C++ code generated with wxFormBuilder (version 3.9.0 Nov 1 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -93,6 +93,7 @@ DIALOG_UNUSED_PAD_LAYERS_BASE::DIALOG_UNUSED_PAD_LAYERS_BASE( wxWindow* parent, this->SetSizer( m_MainSizer ); this->Layout(); + m_MainSizer->Fit( this ); this->Centre( wxBOTH ); diff --git a/pcbnew/dialogs/dialog_unused_pad_layers_base.h b/pcbnew/dialogs/dialog_unused_pad_layers_base.h index f675267dc0..ad57b62692 100644 --- a/pcbnew/dialogs/dialog_unused_pad_layers_base.h +++ b/pcbnew/dialogs/dialog_unused_pad_layers_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.9.0 Jul 27 2020) +// C++ code generated with wxFormBuilder (version 3.9.0 Nov 1 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -56,7 +56,7 @@ class DIALOG_UNUSED_PAD_LAYERS_BASE : public DIALOG_SHIM public: - DIALOG_UNUSED_PAD_LAYERS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Unused Pad Layers"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 602,321 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_UNUSED_PAD_LAYERS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Unused Pad Layers"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_UNUSED_PAD_LAYERS_BASE(); }; diff --git a/pcbnew/import_gfx/dialog_import_gfx_base.cpp b/pcbnew/import_gfx/dialog_import_gfx_base.cpp index 337b504a16..b49720094d 100644 --- a/pcbnew/import_gfx/dialog_import_gfx_base.cpp +++ b/pcbnew/import_gfx/dialog_import_gfx_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.9.0 Nov 1 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -42,7 +42,7 @@ DIALOG_IMPORT_GFX_BASE::DIALOG_IMPORT_GFX_BASE( wxWindow* parent, wxWindowID id, bSizerMain->Add( bSizerFile, 0, wxALL|wxEXPAND, 5 ); wxStaticBoxSizer* sbSizer2; - sbSizer2 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Placement:") ), wxVERTICAL ); + sbSizer2 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Placement") ), wxVERTICAL ); wxBoxSizer* bSizerOptions; bSizerOptions = new wxBoxSizer( wxVERTICAL ); @@ -116,10 +116,10 @@ DIALOG_IMPORT_GFX_BASE::DIALOG_IMPORT_GFX_BASE( wxWindow* parent, wxWindowID id, sbSizer2->Add( bSizerOptions, 0, wxEXPAND|wxLEFT, 20 ); - bSizerMain->Add( sbSizer2, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); + bSizerMain->Add( sbSizer2, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); wxStaticBoxSizer* sbSizer1; - sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Import parameters:") ), wxVERTICAL ); + sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Import Parameters") ), wxVERTICAL ); wxBoxSizer* bSizer7; bSizer7 = new wxBoxSizer( wxHORIZONTAL ); @@ -187,7 +187,7 @@ DIALOG_IMPORT_GFX_BASE::DIALOG_IMPORT_GFX_BASE( wxWindow* parent, wxWindowID id, sbSizer1->Add( bSizer8, 0, wxALL|wxEXPAND, 5 ); - bSizerMain->Add( sbSizer1, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); + bSizerMain->Add( sbSizer1, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); bSizerMain->Add( 0, 0, 0, wxEXPAND, 5 ); @@ -204,6 +204,7 @@ DIALOG_IMPORT_GFX_BASE::DIALOG_IMPORT_GFX_BASE( wxWindow* parent, wxWindowID id, this->SetSizer( bSizerMain ); this->Layout(); + bSizerMain->Fit( this ); this->Centre( wxBOTH ); diff --git a/pcbnew/import_gfx/dialog_import_gfx_base.fbp b/pcbnew/import_gfx/dialog_import_gfx_base.fbp index 72913df727..592120e830 100644 --- a/pcbnew/import_gfx/dialog_import_gfx_base.fbp +++ b/pcbnew/import_gfx/dialog_import_gfx_base.fbp @@ -14,6 +14,7 @@ dialog_import_gfx_base 1000 none + 1 dialog_dxf_import @@ -25,6 +26,7 @@ 1 1 UI + 0 0 0 @@ -45,7 +47,7 @@ DIALOG_IMPORT_GFX_BASE - 446,432 + -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h Import Vector Graphics File @@ -205,6 +207,7 @@ + 0 @@ -270,10 +273,10 @@ 5 wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP - 1 + 0 wxID_ANY - Placement: + Placement sbSizer2 wxVERTICAL @@ -825,10 +828,10 @@ 5 wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP - 1 + 0 wxID_ANY - Import parameters: + Import Parameters sbSizer1 wxVERTICAL diff --git a/pcbnew/import_gfx/dialog_import_gfx_base.h b/pcbnew/import_gfx/dialog_import_gfx_base.h index d313a2a04c..34113f06a2 100644 --- a/pcbnew/import_gfx/dialog_import_gfx_base.h +++ b/pcbnew/import_gfx/dialog_import_gfx_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.9.0 Nov 1 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -20,10 +20,10 @@ class PCB_LAYER_BOX_SELECTOR; #include #include #include +#include #include #include #include -#include #include #include #include @@ -81,7 +81,7 @@ class DIALOG_IMPORT_GFX_BASE : public DIALOG_SHIM public: - DIALOG_IMPORT_GFX_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Import Vector Graphics File"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 446,432 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_IMPORT_GFX_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Import Vector Graphics File"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_IMPORT_GFX_BASE(); };