diff --git a/pcbnew/dialogs/dialog_footprint_wizard_list_base.cpp b/pcbnew/dialogs/dialog_footprint_wizard_list_base.cpp index 9219a779f4..b98793be10 100644 --- a/pcbnew/dialogs/dialog_footprint_wizard_list_base.cpp +++ b/pcbnew/dialogs/dialog_footprint_wizard_list_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jul 11 2018) +// C++ code generated with wxFormBuilder (version 3.10.0-39-g3487c3cb) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -12,53 +12,53 @@ DIALOG_FOOTPRINT_WIZARD_LIST_BASE::DIALOG_FOOTPRINT_WIZARD_LIST_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 ); - + wxBoxSizer* bSizerMain; bSizerMain = new wxBoxSizer( wxVERTICAL ); - + m_notebook = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); m_panelGenerators = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_panelGenerators->SetMinSize( wxSize( 550,300 ) ); - + wxBoxSizer* bSizerpanelGen; bSizerpanelGen = new wxBoxSizer( wxVERTICAL ); - + m_footprintGeneratorsGrid = new wxGrid( m_panelGenerators, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - + // Grid m_footprintGeneratorsGrid->CreateGrid( 0, 3 ); m_footprintGeneratorsGrid->EnableEditing( false ); m_footprintGeneratorsGrid->EnableGridLines( true ); m_footprintGeneratorsGrid->EnableDragGridSize( false ); m_footprintGeneratorsGrid->SetMargins( 0, 0 ); - + // Columns m_footprintGeneratorsGrid->SetColSize( 0, 40 ); m_footprintGeneratorsGrid->SetColSize( 1, 160 ); m_footprintGeneratorsGrid->SetColSize( 2, 325 ); m_footprintGeneratorsGrid->EnableDragColMove( false ); m_footprintGeneratorsGrid->EnableDragColSize( true ); - m_footprintGeneratorsGrid->SetColLabelSize( 20 ); m_footprintGeneratorsGrid->SetColLabelValue( 0, wxEmptyString ); m_footprintGeneratorsGrid->SetColLabelValue( 1, _("Name") ); m_footprintGeneratorsGrid->SetColLabelValue( 2, _("Description") ); - m_footprintGeneratorsGrid->SetColLabelAlignment( wxALIGN_LEFT, wxALIGN_CENTRE ); - + m_footprintGeneratorsGrid->SetColLabelSize( 20 ); + m_footprintGeneratorsGrid->SetColLabelAlignment( wxALIGN_LEFT, wxALIGN_CENTER ); + // Rows m_footprintGeneratorsGrid->AutoSizeRows(); m_footprintGeneratorsGrid->EnableDragRowSize( true ); m_footprintGeneratorsGrid->SetRowLabelSize( 0 ); - m_footprintGeneratorsGrid->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); - + m_footprintGeneratorsGrid->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER ); + // Label Appearance - + // Cell Defaults m_footprintGeneratorsGrid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP ); m_footprintGeneratorsGrid->SetMinSize( wxSize( 485,120 ) ); - + bSizerpanelGen->Add( m_footprintGeneratorsGrid, 1, wxALL|wxEXPAND, 5 ); - - + + m_panelGenerators->SetSizer( bSizerpanelGen ); m_panelGenerators->Layout(); bSizerpanelGen->Fit( m_panelGenerators ); @@ -66,59 +66,59 @@ DIALOG_FOOTPRINT_WIZARD_LIST_BASE::DIALOG_FOOTPRINT_WIZARD_LIST_BASE( wxWindow* m_panelInfo = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* m_bsizerPanelInfo; m_bsizerPanelInfo = new wxBoxSizer( wxVERTICAL ); - + m_staticTextSearchPaths = new wxStaticText( m_panelInfo, wxID_ANY, _("Search paths:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextSearchPaths->Wrap( -1 ); m_bsizerPanelInfo->Add( m_staticTextSearchPaths, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_tcSearchPaths = new wxTextCtrl( m_panelInfo, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY ); m_bsizerPanelInfo->Add( m_tcSearchPaths, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - + m_staticTextNotLoaded = new wxStaticText( m_panelInfo, wxID_ANY, _("Not loadable python scripts:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextNotLoaded->Wrap( -1 ); m_bsizerPanelInfo->Add( m_staticTextNotLoaded, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + m_tcNotLoaded = new wxTextCtrl( m_panelInfo, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY ); m_bsizerPanelInfo->Add( m_tcNotLoaded, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - + m_buttonShowTrace = new wxButton( m_panelInfo, wxID_ANY, _("Show Trace"), wxDefaultPosition, wxDefaultSize, 0 ); m_bsizerPanelInfo->Add( m_buttonShowTrace, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - + + m_panelInfo->SetSizer( m_bsizerPanelInfo ); m_panelInfo->Layout(); m_bsizerPanelInfo->Fit( m_panelInfo ); m_notebook->AddPage( m_panelInfo, _("Messages"), false ); - + bSizerMain->Add( m_notebook, 1, wxEXPAND | wxALL, 5 ); - + wxBoxSizer* bSizerLower; bSizerLower = new wxBoxSizer( wxHORIZONTAL ); - + m_buttonUpdateModules = new wxButton( this, wxID_ANY, _("Update Python Modules"), wxDefaultPosition, wxDefaultSize, 0 ); bSizerLower->Add( m_buttonUpdateModules, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - + + bSizerLower->Add( 0, 0, 1, wxRIGHT|wxLEFT, 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(); - + bSizerLower->Add( m_sdbSizer, 0, wxALL, 5 ); - - + + bSizerMain->Add( bSizerLower, 0, wxEXPAND|wxLEFT, 10 ); - - + + this->SetSizer( bSizerMain ); this->Layout(); - + this->Centre( wxBOTH ); - + // Connect Events m_footprintGeneratorsGrid->Connect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( DIALOG_FOOTPRINT_WIZARD_LIST_BASE::OnCellFpGeneratorClick ), NULL, this ); m_footprintGeneratorsGrid->Connect( wxEVT_GRID_CELL_LEFT_DCLICK, wxGridEventHandler( DIALOG_FOOTPRINT_WIZARD_LIST_BASE::OnCellFpGeneratorDoubleClick ), NULL, this ); @@ -133,32 +133,33 @@ DIALOG_FOOTPRINT_WIZARD_LIST_BASE::~DIALOG_FOOTPRINT_WIZARD_LIST_BASE() m_footprintGeneratorsGrid->Disconnect( wxEVT_GRID_CELL_LEFT_DCLICK, wxGridEventHandler( DIALOG_FOOTPRINT_WIZARD_LIST_BASE::OnCellFpGeneratorDoubleClick ), NULL, this ); m_buttonShowTrace->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FOOTPRINT_WIZARD_LIST_BASE::onShowTrace ), NULL, this ); m_buttonUpdateModules->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FOOTPRINT_WIZARD_LIST_BASE::onUpdatePythonModulesClick ), NULL, this ); - + } DIALOG_FOOTPRINT_WIZARD_LOG::DIALOG_FOOTPRINT_WIZARD_LOG( 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 ); - + wxBoxSizer* bSizerMain; bSizerMain = new wxBoxSizer( wxVERTICAL ); - + m_Message = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY ); + m_Message->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); m_Message->SetMinSize( wxSize( 550,300 ) ); - + bSizerMain->Add( m_Message, 1, wxALL|wxEXPAND, 5 ); - + m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerOK = new wxButton( this, wxID_OK ); m_sdbSizer->AddButton( m_sdbSizerOK ); m_sdbSizer->Realize(); - + bSizerMain->Add( m_sdbSizer, 0, wxALL|wxALIGN_RIGHT, 5 ); - - + + this->SetSizer( bSizerMain ); this->Layout(); - + this->Centre( wxBOTH ); } diff --git a/pcbnew/dialogs/dialog_footprint_wizard_list_base.fbp b/pcbnew/dialogs/dialog_footprint_wizard_list_base.fbp index 5adaa91b7c..88a27411e1 100644 --- a/pcbnew/dialogs/dialog_footprint_wizard_list_base.fbp +++ b/pcbnew/dialogs/dialog_footprint_wizard_list_base.fbp @@ -1,8 +1,8 @@ - + - + C++ 1 source_name @@ -14,96 +14,50 @@ dialog_footprint_wizard_list_base 1000 none - + + 1 DIALOG_FOOTPRINT_WIZARD_LIST_BASE - + . - + 1 1 1 1 UI + 0 0 0 0 wxAUI_MGR_DEFAULT - + wxBOTH - + 1 1 impl_virtual - - - + + + 0 wxID_ANY - + -1,-1 DIALOG_FOOTPRINT_WIZARD_LIST_BASE - + 525,374 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h Footprint Generators - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + 0 + + + - + bSizerMain wxVERTICAL none @@ -116,88 +70,56 @@ 1 1 1 - - - - - - - - + + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_notebook 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - + Available Footprint Generators 1 @@ -205,84 +127,54 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 550,300 1 m_panelGenerators 1 - - + + protected 1 - + Resizable 1 - - + + 0 - - - + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + bSizerpanelGen wxVERTICAL none @@ -295,20 +187,20 @@ 1 1 1 - - - - + + + + 0 1 - - - + + + 1 - - + + wxALIGN_LEFT - + wxALIGN_TOP 0 1 @@ -318,7 +210,7 @@ wxALIGN_CENTER 3 40,160,325 - + 1 0 Dock @@ -330,117 +222,57 @@ 1 0 1 - + 1 - - + + 1 0 0 wxID_ANY - - - + + + 0 0 - + 0 - - + + 0 485,120 1 m_footprintGeneratorsGrid 1 - - + + protected 1 - + Resizable wxALIGN_CENTER 0 - + wxALIGN_CENTER - + 0 1 - - + + 0 - - - - - - - - - - - - - - - + + + + OnCellFpGeneratorClick OnCellFpGeneratorDoubleClick - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Messages 0 @@ -448,84 +280,54 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_panelInfo 1 - - + + protected 1 - + Resizable 1 - - + + 0 - - - + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + m_bsizerPanelInfo wxVERTICAL none @@ -538,86 +340,56 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Search paths: 0 - + 0 - - + + 0 - + 1 m_staticTextSearchPaths 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -629,93 +401,59 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - + 0 - + 0 -1,-1 1 m_tcSearchPaths 1 - - + + protected 1 - + Resizable 1 - + wxTE_MULTILINE|wxTE_READONLY - + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + @@ -727,86 +465,56 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Not loadable python scripts: 0 - + 0 - - + + 0 - + 1 m_staticTextNotLoaded 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -818,93 +526,59 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - + 0 - + 0 -1,-1 1 m_tcNotLoaded 1 - - + + protected 1 - + Resizable 1 - + wxTE_MULTILINE|wxTE_READONLY - + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + @@ -916,98 +590,69 @@ 1 1 1 - - - - - - - - + + + + + 0 + + + + 1 0 1 - + 1 - + 0 0 - + Dock 0 Left 1 - + 1 - - + + 0 0 wxID_ANY Show Trace - + 0 - + 0 - - + + 0 - + 1 m_buttonShowTrace 1 - - + + protected 1 - - - + + + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - + + + + onShowTrace - - - - - - - - - - - - - - - - - - - - - - - - @@ -1020,7 +665,7 @@ wxEXPAND|wxLEFT 0 - + bSizerLower wxHORIZONTAL none @@ -1033,98 +678,69 @@ 1 1 1 - - - - - - - - + + + + + 0 + + + + 1 0 1 - + 1 - + 0 0 - + Dock 0 Left 1 - + 1 - - + + 0 0 wxID_ANY Update Python Modules - + 0 - + 0 - - + + 0 - + 1 m_buttonUpdateModules 1 - - + + protected 1 - - - + + + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - + + + + onUpdatePythonModulesClick - - - - - - - - - - - - - - - - - - - - - - - - @@ -1150,17 +766,9 @@ 1 0 0 - + m_sdbSizer protected - - - - - - - - @@ -1170,80 +778,32 @@ 0 wxAUI_MGR_DEFAULT - + wxBOTH - + 1 1 impl_virtual - - - + + + 0 wxID_ANY - + -1,-1 DIALOG_FOOTPRINT_WIZARD_LOG - + 646,361 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h Traceback of Python Script Errors - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + 0 + + + - + bSizerMain wxVERTICAL none @@ -1256,93 +816,59 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + ,90,400,-1,76,0 0 0 wxID_ANY - + 0 - + 0 - + 0 550,300 1 m_Message 1 - - + + public 1 - + Resizable 1 - + wxTE_MULTILINE|wxTE_READONLY - + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + @@ -1358,17 +884,9 @@ 1 0 0 - + m_sdbSizer protected - - - - - - - - diff --git a/pcbnew/dialogs/dialog_footprint_wizard_list_base.h b/pcbnew/dialogs/dialog_footprint_wizard_list_base.h index 29b394e6f2..b2a49199dc 100644 --- a/pcbnew/dialogs/dialog_footprint_wizard_list_base.h +++ b/pcbnew/dialogs/dialog_footprint_wizard_list_base.h @@ -1,12 +1,11 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jul 11 2018) +// C++ code generated with wxFormBuilder (version 3.10.0-39-g3487c3cb) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#ifndef __DIALOG_FOOTPRINT_WIZARD_LIST_BASE_H__ -#define __DIALOG_FOOTPRINT_WIZARD_LIST_BASE_H__ +#pragma once #include #include @@ -38,7 +37,7 @@ class DIALOG_FOOTPRINT_WIZARD_LIST_BASE : public DIALOG_SHIM { private: - + protected: wxNotebook* m_notebook; wxPanel* m_panelGenerators; @@ -53,19 +52,20 @@ class DIALOG_FOOTPRINT_WIZARD_LIST_BASE : public DIALOG_SHIM wxStdDialogButtonSizer* m_sdbSizer; wxButton* m_sdbSizerOK; wxButton* m_sdbSizerCancel; - - // Virtual event handlers, overide them in your derived class + + // Virtual event handlers, override them in your derived class virtual void OnCellFpGeneratorClick( wxGridEvent& event ) { event.Skip(); } virtual void OnCellFpGeneratorDoubleClick( wxGridEvent& event ) { event.Skip(); } virtual void onShowTrace( wxCommandEvent& event ) { event.Skip(); } virtual void onUpdatePythonModulesClick( wxCommandEvent& event ) { event.Skip(); } - - + + public: - - DIALOG_FOOTPRINT_WIZARD_LIST_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Footprint Generators"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 525,374 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + + DIALOG_FOOTPRINT_WIZARD_LIST_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Footprint Generators"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 525,374 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + ~DIALOG_FOOTPRINT_WIZARD_LIST_BASE(); - + }; /////////////////////////////////////////////////////////////////////////////// @@ -74,17 +74,17 @@ class DIALOG_FOOTPRINT_WIZARD_LIST_BASE : public DIALOG_SHIM class DIALOG_FOOTPRINT_WIZARD_LOG : public DIALOG_SHIM { private: - + protected: wxStdDialogButtonSizer* m_sdbSizer; wxButton* m_sdbSizerOK; - + public: wxTextCtrl* m_Message; - - DIALOG_FOOTPRINT_WIZARD_LOG( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Traceback of Python Script Errors"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 646,361 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + + DIALOG_FOOTPRINT_WIZARD_LOG( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Traceback of Python Script Errors"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 646,361 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + ~DIALOG_FOOTPRINT_WIZARD_LOG(); - + }; -#endif //__DIALOG_FOOTPRINT_WIZARD_LIST_BASE_H__