diff --git a/kicad/dialogs/dialog_template_selector_base.cpp b/kicad/dialogs/dialog_template_selector_base.cpp index a8a67226d6..a8f40c48aa 100644 --- a/kicad/dialogs/dialog_template_selector_base.cpp +++ b/kicad/dialogs/dialog_template_selector_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 19 2018) +// C++ code generated with wxFormBuilder (version Dec 1 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -12,54 +12,54 @@ DIALOG_TEMPLATE_SELECTOR_BASE::DIALOG_TEMPLATE_SELECTOR_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( 640,480 ), wxDefaultSize ); - + wxBoxSizer* bmainSizer; bmainSizer = new wxBoxSizer( wxVERTICAL ); - + m_notebook = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - + bmainSizer->Add( m_notebook, 0, wxEXPAND | wxALL, 3 ); - + m_htmlWin = new wxHtmlWindow( this, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxHW_SCROLLBAR_AUTO ); bmainSizer->Add( m_htmlWin, 1, wxALL|wxEXPAND, 3 ); - + m_staticTextTpath = new wxStaticText( this, wxID_ANY, _("Template path:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextTpath->Wrap( -1 ); bmainSizer->Add( m_staticTextTpath, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + wxBoxSizer* bsizerTemplateSelector; bsizerTemplateSelector = new wxBoxSizer( wxHORIZONTAL ); - + m_tcTemplatePath = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER ); - bsizerTemplateSelector->Add( m_tcTemplatePath, 1, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - + bsizerTemplateSelector->Add( m_tcTemplatePath, 1, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + m_buttonBrowse = new wxButton( this, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); bsizerTemplateSelector->Add( m_buttonBrowse, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 ); - + m_buttonValidate = new wxButton( this, wxID_ANY, _("Validate"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); bsizerTemplateSelector->Add( m_buttonValidate, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 ); - - + + bmainSizer->Add( bsizerTemplateSelector, 0, wxEXPAND, 5 ); - + m_staticline = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); bmainSizer->Add( m_staticline, 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(); - + bmainSizer->Add( m_sdbSizer, 0, wxALL|wxEXPAND, 3 ); - - + + this->SetSizer( bmainSizer ); this->Layout(); - + this->Centre( wxBOTH ); - + // Connect Events m_notebook->Connect( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEventHandler( DIALOG_TEMPLATE_SELECTOR_BASE::OnPageChange ), NULL, this ); m_htmlWin->Connect( wxEVT_COMMAND_HTML_LINK_CLICKED, wxHtmlLinkEventHandler( DIALOG_TEMPLATE_SELECTOR_BASE::OnHtmlLinkActivated ), NULL, this ); @@ -74,24 +74,24 @@ DIALOG_TEMPLATE_SELECTOR_BASE::~DIALOG_TEMPLATE_SELECTOR_BASE() m_htmlWin->Disconnect( wxEVT_COMMAND_HTML_LINK_CLICKED, wxHtmlLinkEventHandler( DIALOG_TEMPLATE_SELECTOR_BASE::OnHtmlLinkActivated ), NULL, this ); m_buttonBrowse->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_TEMPLATE_SELECTOR_BASE::onDirectoryBrowseClicked ), NULL, this ); m_buttonValidate->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_TEMPLATE_SELECTOR_BASE::onValidatePath ), NULL, this ); - + } -TEMPLATE_SELECTION_PANEL_BASE::TEMPLATE_SELECTION_PANEL_BASE( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) +TEMPLATE_SELECTION_PANEL_BASE::TEMPLATE_SELECTION_PANEL_BASE( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name ) { m_SizerBase = new wxBoxSizer( wxHORIZONTAL ); - + m_scrolledWindow = new wxScrolledWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL ); m_scrolledWindow->SetScrollRate( 5, 5 ); m_SizerChoice = new wxBoxSizer( wxHORIZONTAL ); - - + + m_scrolledWindow->SetSizer( m_SizerChoice ); m_scrolledWindow->Layout(); m_SizerChoice->Fit( m_scrolledWindow ); m_SizerBase->Add( m_scrolledWindow, 0, wxEXPAND | wxALL, 3 ); - - + + this->SetSizer( m_SizerBase ); this->Layout(); } @@ -100,22 +100,22 @@ TEMPLATE_SELECTION_PANEL_BASE::~TEMPLATE_SELECTION_PANEL_BASE() { } -TEMPLATE_WIDGET_BASE::TEMPLATE_WIDGET_BASE( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) +TEMPLATE_WIDGET_BASE::TEMPLATE_WIDGET_BASE( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name ) { this->SetMinSize( wxSize( 74,-1 ) ); this->SetMaxSize( wxSize( 74,-1 ) ); - + wxBoxSizer* bSizer4; bSizer4 = new wxBoxSizer( wxVERTICAL ); - + m_bitmapIcon = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 64,64 ), 0 ); - bSizer4->Add( m_bitmapIcon, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 3 ); - - m_staticTitle = new wxStaticText( this, wxID_ANY, _("Project Template Title"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE ); + bSizer4->Add( m_bitmapIcon, 0, wxALL|wxEXPAND, 3 ); + + m_staticTitle = new wxStaticText( this, wxID_ANY, _("Project Template Title"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL ); m_staticTitle->Wrap( 150 ); - bSizer4->Add( m_staticTitle, 1, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 3 ); - - + bSizer4->Add( m_staticTitle, 1, wxALL|wxEXPAND, 3 ); + + this->SetSizer( bSizer4 ); this->Layout(); } diff --git a/kicad/dialogs/dialog_template_selector_base.fbp b/kicad/dialogs/dialog_template_selector_base.fbp index 2e8e0a2439..513197df81 100644 --- a/kicad/dialogs/dialog_template_selector_base.fbp +++ b/kicad/dialogs/dialog_template_selector_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -53,42 +53,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bmainSizer @@ -151,31 +115,7 @@ - - - - - - - - - - - - - - - - OnPageChange - - - - - - - - @@ -234,32 +174,7 @@ - - - - - OnHtmlLinkActivated - - - - - - - - - - - - - - - - - - - - @@ -295,6 +210,7 @@ 0 wxID_ANY Template path: + 0 0 @@ -320,29 +236,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -356,7 +249,7 @@ none 5 - wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + wxBOTTOM|wxLEFT|wxRIGHT 1 1 @@ -416,33 +309,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -460,25 +326,31 @@ + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY Browse + + 0 0 @@ -493,6 +365,8 @@ protected 1 + + Resizable 1 @@ -508,29 +382,6 @@ onDirectoryBrowseClicked - - - - - - - - - - - - - - - - - - - - - - - @@ -548,25 +399,31 @@ + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY Validate + + 0 0 @@ -581,6 +438,8 @@ protected 1 + + Resizable 1 @@ -596,29 +455,6 @@ onValidatePath - - - - - - - - - - - - - - - - - - - - - - - @@ -679,29 +515,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -720,14 +533,6 @@ m_sdbSizer protected - - - - - - - - @@ -753,37 +558,7 @@ - wxNO_BORDER|wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + wxTAB_TRAVERSAL|wxBORDER_NONE m_SizerBase @@ -846,29 +621,6 @@ wxHSCROLL - - - - - - - - - - - - - - - - - - - - - - - m_SizerChoice @@ -895,42 +647,12 @@ 74,-1 TEMPLATE_WIDGET_BASE - 74,-1 + 74,118 wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer4 @@ -938,7 +660,7 @@ none 3 - wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -992,34 +714,11 @@ - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND + wxALL|wxEXPAND 1 1 @@ -1050,6 +749,7 @@ 0 wxID_ANY Project Template Title + 0 0 @@ -1067,7 +767,7 @@ Resizable 1 - wxALIGN_CENTRE + wxALIGN_CENTER_HORIZONTAL 0 @@ -1075,29 +775,6 @@ 150 - - - - - - - - - - - - - - - - - - - - - - - diff --git a/kicad/dialogs/dialog_template_selector_base.h b/kicad/dialogs/dialog_template_selector_base.h index 394da46fa4..283ec7ba30 100644 --- a/kicad/dialogs/dialog_template_selector_base.h +++ b/kicad/dialogs/dialog_template_selector_base.h @@ -1,12 +1,11 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 19 2018) +// C++ code generated with wxFormBuilder (version Dec 1 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#ifndef __DIALOG_TEMPLATE_SELECTOR_BASE_H__ -#define __DIALOG_TEMPLATE_SELECTOR_BASE_H__ +#pragma once #include #include @@ -21,15 +20,15 @@ #include #include #include +#include +#include +#include #include #include #include #include #include #include -#include -#include -#include #include /////////////////////////////////////////////////////////////////////////// @@ -41,7 +40,7 @@ class DIALOG_TEMPLATE_SELECTOR_BASE : public DIALOG_SHIM { private: - + protected: wxNotebook* m_notebook; wxHtmlWindow* m_htmlWin; @@ -53,56 +52,55 @@ class DIALOG_TEMPLATE_SELECTOR_BASE : public DIALOG_SHIM wxStdDialogButtonSizer* m_sdbSizer; wxButton* m_sdbSizerOK; wxButton* m_sdbSizerCancel; - + // Virtual event handlers, overide them in your derived class virtual void OnPageChange( wxNotebookEvent& event ) { event.Skip(); } virtual void OnHtmlLinkActivated( wxHtmlLinkEvent& event ) { event.Skip(); } virtual void onDirectoryBrowseClicked( wxCommandEvent& event ) { event.Skip(); } virtual void onValidatePath( wxCommandEvent& event ) { event.Skip(); } - - + + public: - - DIALOG_TEMPLATE_SELECTOR_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Project Template Selector"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 640,480 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + + DIALOG_TEMPLATE_SELECTOR_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Project Template Selector"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 640,480 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_TEMPLATE_SELECTOR_BASE(); - + }; /////////////////////////////////////////////////////////////////////////////// /// Class TEMPLATE_SELECTION_PANEL_BASE /////////////////////////////////////////////////////////////////////////////// -class TEMPLATE_SELECTION_PANEL_BASE : public wxPanel +class TEMPLATE_SELECTION_PANEL_BASE : public wxPanel { private: - + protected: - + public: wxBoxSizer* m_SizerBase; wxScrolledWindow* m_scrolledWindow; wxBoxSizer* m_SizerChoice; - - TEMPLATE_SELECTION_PANEL_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,140 ), long style = wxNO_BORDER|wxTAB_TRAVERSAL ); + + TEMPLATE_SELECTION_PANEL_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,140 ), long style = wxTAB_TRAVERSAL|wxBORDER_NONE, const wxString& name = wxEmptyString ); ~TEMPLATE_SELECTION_PANEL_BASE(); - + }; /////////////////////////////////////////////////////////////////////////////// /// Class TEMPLATE_WIDGET_BASE /////////////////////////////////////////////////////////////////////////////// -class TEMPLATE_WIDGET_BASE : public wxPanel +class TEMPLATE_WIDGET_BASE : public wxPanel { private: - + protected: wxStaticBitmap* m_bitmapIcon; wxStaticText* m_staticTitle; - + public: - - TEMPLATE_WIDGET_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 74,-1 ), long style = wxTAB_TRAVERSAL ); + + TEMPLATE_WIDGET_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 74,118 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); ~TEMPLATE_WIDGET_BASE(); - + }; -#endif //__DIALOG_TEMPLATE_SELECTOR_BASE_H__