From 3eae0feeaa1fe1391474db08ba1e8e2a5c130e36 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Sun, 30 Aug 2015 13:00:30 +0200 Subject: [PATCH] Fix incorrect default URL in wizard_add_fplib_base. Update an old test dialog. --- pcbnew/dialogs/dialog_scripting_base.cpp | 14 +- pcbnew/dialogs/dialog_scripting_base.fbp | 341 ++++++++++++++--------- pcbnew/dialogs/dialog_scripting_base.h | 13 +- pcbnew/dialogs/wizard_add_fplib_base.cpp | 10 +- pcbnew/dialogs/wizard_add_fplib_base.fbp | 2 +- pcbnew/dialogs/wizard_add_fplib_base.h | 2 +- 6 files changed, 229 insertions(+), 153 deletions(-) diff --git a/pcbnew/dialogs/dialog_scripting_base.cpp b/pcbnew/dialogs/dialog_scripting_base.cpp index 4064b79b95..3b2cb4fa16 100644 --- a/pcbnew/dialogs/dialog_scripting_base.cpp +++ b/pcbnew/dialogs/dialog_scripting_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Sep 8 2010) +// C++ code generated with wxFormBuilder (version Jun 17 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -13,18 +13,20 @@ DIALOG_SCRIPTING_BASE::DIALOG_SCRIPTING_BASE( wxWindow* parent, wxWindowID id, c { this->SetSizeHints( wxDefaultSize, wxDefaultSize ); - wxBoxSizer* bSizer4; - bSizer4 = new wxBoxSizer( wxVERTICAL ); + wxBoxSizer* bSizerMain; + bSizerMain = new wxBoxSizer( wxVERTICAL ); m_txScript = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxTE_MULTILINE ); + m_txScript->SetMaxLength( 0 ); m_txScript->SetMinSize( wxSize( 480,500 ) ); - bSizer4->Add( m_txScript, 0, wxALL, 5 ); + bSizerMain->Add( m_txScript, 1, wxALL|wxEXPAND, 5 ); m_btRun = new wxButton( this, wxID_ANY, wxT("&Run"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer4->Add( m_btRun, 0, wxALL, 5 ); + bSizerMain->Add( m_btRun, 0, wxALL, 5 ); - this->SetSizer( bSizer4 ); + + this->SetSizer( bSizerMain ); this->Layout(); this->Centre( wxBOTH ); diff --git a/pcbnew/dialogs/dialog_scripting_base.fbp b/pcbnew/dialogs/dialog_scripting_base.fbp index cda3640ffb..d9b5e9876d 100644 --- a/pcbnew/dialogs/dialog_scripting_base.fbp +++ b/pcbnew/dialogs/dialog_scripting_base.fbp @@ -1,12 +1,14 @@ - + - + C++ 1 source_name + 0 0 + res UTF-8 connect dialog_scripting_base @@ -14,134 +16,172 @@ none 0 DIALOG_SCRIPTING_BASE - + . - + 1 + 1 + 1 1 + UI 0 0 - + 0 + wxAUI_MGR_DEFAULT + wxBOTH - + 1 1 impl_virtual - - - + + + 0 wxID_ANY - - + + DIALOG_SCRIPTING_BASE - - 500,600 + + 500,468 wxDEFAULT_FRAME_STYLE - + Scripting Test Window - - - wxFILTER_NONE - wxDefaultValidator - - - + + + wxTAB_TRAVERSAL 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - bSizer4 + + bSizerMain wxVERTICAL none 5 - wxALL - 0 + wxALL|wxEXPAND + 1 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY - + + 0 + 0 + + 0 480,500 + 1 m_txScript + 1 + + protected - - + 1 + + Resizable + 1 + wxHSCROLL|wxTE_MULTILINE - - - + + 0 + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -149,56 +189,87 @@ wxALL 0 - - + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + 1 0 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY &Run - - + + 0 + + + 0 + + 1 m_btRun + 1 + + protected - - - - - - + 1 + + Resizable + 1 + + + + 0 + + wxFILTER_NONE wxDefaultValidator - - - - + + + + OnRunButtonClick - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pcbnew/dialogs/dialog_scripting_base.h b/pcbnew/dialogs/dialog_scripting_base.h index 87dc68b746..eb42fb6b95 100644 --- a/pcbnew/dialogs/dialog_scripting_base.h +++ b/pcbnew/dialogs/dialog_scripting_base.h @@ -1,13 +1,15 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Sep 8 2010) +// C++ code generated with wxFormBuilder (version Jun 17 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#ifndef __dialog_scripting_base__ -#define __dialog_scripting_base__ +#ifndef __DIALOG_SCRIPTING_BASE_H__ +#define __DIALOG_SCRIPTING_BASE_H__ +#include +#include #include #include #include @@ -38,9 +40,10 @@ class DIALOG_SCRIPTING_BASE : public wxFrame public: - DIALOG_SCRIPTING_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Scripting Test Window"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,600 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL ); + DIALOG_SCRIPTING_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Scripting Test Window"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,468 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL ); + ~DIALOG_SCRIPTING_BASE(); }; -#endif //__dialog_scripting_base__ +#endif //__DIALOG_SCRIPTING_BASE_H__ diff --git a/pcbnew/dialogs/wizard_add_fplib_base.cpp b/pcbnew/dialogs/wizard_add_fplib_base.cpp index daa25d4957..343d8985db 100644 --- a/pcbnew/dialogs/wizard_add_fplib_base.cpp +++ b/pcbnew/dialogs/wizard_add_fplib_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2014) +// C++ code generated with wxFormBuilder (version Jun 17 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -46,7 +46,7 @@ WIZARD_FPLIB_TABLE_BASE::WIZARD_FPLIB_TABLE_BASE( wxWindow* parent, wxWindowID i m_radioAddGithub = new wxRadioButton( m_wizPage1, wxID_ANY, _("Github repository"), wxDefaultPosition, wxDefaultSize, 0 ); m_githubSizer->Add( m_radioAddGithub, 0, wxALL|wxEXPAND, 5 ); - m_textCtrlGithubURL = new wxTextCtrl( m_wizPage1, wxID_ANY, _("http://github.com/KiCad"), wxDefaultPosition, wxDefaultSize, 0 ); + m_textCtrlGithubURL = new wxTextCtrl( m_wizPage1, wxID_ANY, _("https://github.com/KiCad"), wxDefaultPosition, wxDefaultSize, 0 ); m_textCtrlGithubURL->SetMinSize( wxSize( 300,-1 ) ); m_githubSizer->Add( m_textCtrlGithubURL, 1, wxALL|wxEXPAND, 5 ); @@ -182,9 +182,9 @@ WIZARD_FPLIB_TABLE_BASE::WIZARD_FPLIB_TABLE_BASE( wxWindow* parent, wxWindowID i bSizer1111->Add( m_staticText1121, 0, wxALL|wxEXPAND, 5 ); m_listCtrlReview = new wxDataViewListCtrl( m_wizPage3_Review, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxDV_HORIZ_RULES|wxDV_ROW_LINES|wxDV_VERT_RULES ); - m_dvLibName = m_listCtrlReview->AppendTextColumn( _("Library") ); - m_dvLibStatus = m_listCtrlReview->AppendTextColumn( _("Status") ); - m_dvLibFormat = m_listCtrlReview->AppendTextColumn( _("Format") ); + m_dvLibName = m_listCtrlReview->AppendTextColumn( _("Library") ); + m_dvLibStatus = m_listCtrlReview->AppendTextColumn( _("Status") ); + m_dvLibFormat = m_listCtrlReview->AppendTextColumn( _("Format") ); bSizer1111->Add( m_listCtrlReview, 1, wxALL|wxEXPAND, 5 ); diff --git a/pcbnew/dialogs/wizard_add_fplib_base.fbp b/pcbnew/dialogs/wizard_add_fplib_base.fbp index 6d41c1c12a..91e3d66633 100644 --- a/pcbnew/dialogs/wizard_add_fplib_base.fbp +++ b/pcbnew/dialogs/wizard_add_fplib_base.fbp @@ -493,7 +493,7 @@ wxFILTER_NONE wxDefaultValidator - http://github.com/KiCad + https://github.com/KiCad diff --git a/pcbnew/dialogs/wizard_add_fplib_base.h b/pcbnew/dialogs/wizard_add_fplib_base.h index 18c5daab26..4535aee1bd 100644 --- a/pcbnew/dialogs/wizard_add_fplib_base.h +++ b/pcbnew/dialogs/wizard_add_fplib_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2014) +// C++ code generated with wxFormBuilder (version Jun 17 2015) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE!