From cfbd156adc46b1655592a5b27424de69caf5e81a Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Sat, 3 Mar 2018 17:37:42 +0100 Subject: [PATCH] Minot fix: fix a minor wxAssert in dialog --- pcbnew/dialogs/wizard_3DShape_Libs_downloader.cpp | 4 ++-- .../wizard_3DShape_Libs_downloader_base.cpp | 14 +++++++------- .../wizard_3DShape_Libs_downloader_base.fbp | 10 +++++----- .../dialogs/wizard_3DShape_Libs_downloader_base.h | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pcbnew/dialogs/wizard_3DShape_Libs_downloader.cpp b/pcbnew/dialogs/wizard_3DShape_Libs_downloader.cpp index a366cab410..cd71778208 100644 --- a/pcbnew/dialogs/wizard_3DShape_Libs_downloader.cpp +++ b/pcbnew/dialogs/wizard_3DShape_Libs_downloader.cpp @@ -25,7 +25,7 @@ */ /** - * @brief Wizard for selecting and dowloading D shapes libraries of footprints + * @brief Wizard for selecting and dowloading 3D shapes libraries of footprints * consisting of 3 steps: * - select source and destination (Github URL and local folder) * - pick and select libraries @@ -348,7 +348,7 @@ void WIZARD_3DSHAPE_LIBS_DOWNLOADER::getLibsListGithub( wxArrayString& aList ) } -// Download the .pretty libraries folders found in aUrlList and store them on disk +// Download the .3Dshapes libraries folders found in aUrlList and store them on disk // in a master folder bool WIZARD_3DSHAPE_LIBS_DOWNLOADER::downloadGithubLibsFromList( wxArrayString& aUrlList, wxString* aErrorMessage ) diff --git a/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp b/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp index 176fbcf775..b9a54f55cf 100644 --- a/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp +++ b/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.cpp @@ -1,8 +1,8 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 22 2017) +// C++ code generated with wxFormBuilder (version Aug 4 2017) // http://www.wxformbuilder.org/ // -// PLEASE DO *NOT* EDIT THIS FILE! +// PLEASE DO "NOT" EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// #include "wizard_3DShape_Libs_downloader_base.h" @@ -58,10 +58,10 @@ WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE::WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE( wxWind bSizerDinname->Add( m_staticText9, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); m_downloadDir = new wxTextCtrl( m_wizPage1, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - bSizerDinname->Add( m_downloadDir, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + bSizerDinname->Add( m_downloadDir, 0, wxRIGHT|wxEXPAND, 5 ); - fgSizerLocalFolder->Add( bSizerDinname, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerLocalFolder->Add( bSizerDinname, 1, wxEXPAND, 5 ); wxBoxSizer* bSizerButts; bSizerButts = new wxBoxSizer( wxVERTICAL ); @@ -79,13 +79,13 @@ WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE::WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE( wxWind bSizerWarnMsg = new wxBoxSizer( wxHORIZONTAL ); m_bitmapDirWarn = new wxStaticBitmap( m_wizPage1, wxID_ANY, wxArtProvider::GetBitmap( wxART_ERROR, wxART_OTHER ), wxDefaultPosition, wxDefaultSize, 0 ); - bSizerWarnMsg->Add( m_bitmapDirWarn, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); + bSizerWarnMsg->Add( m_bitmapDirWarn, 0, wxALL, 5 ); m_invalidDirWarningText = new wxStaticText( m_wizPage1, wxID_ANY, _("It is not possible to write in the selected directory.\nPlease choose another one."), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE ); m_invalidDirWarningText->Wrap( -1 ); m_invalidDirWarningText->SetForegroundColour( wxColour( 255, 0, 0 ) ); - bSizerWarnMsg->Add( m_invalidDirWarningText, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + bSizerWarnMsg->Add( m_invalidDirWarningText, 0, wxALL|wxEXPAND, 5 ); fgSizerLocalFolder->Add( bSizerWarnMsg, 1, wxEXPAND, 5 ); @@ -109,7 +109,7 @@ WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE::WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE( wxWind bSizerOfficialRepo->Add( 0, 0, 0, wxRIGHT|wxLEFT, 10 ); m_hyperlinkGithubKicad = new wxHyperlinkCtrl( m_wizPage1, wxID_ANY, _("Visit our official Kicad repository on Github and get more libraries"), wxT("https://github.com/KiCad"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE ); - bSizerOfficialRepo->Add( m_hyperlinkGithubKicad, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + bSizerOfficialRepo->Add( m_hyperlinkGithubKicad, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); bSizer1->Add( bSizerOfficialRepo, 0, wxEXPAND, 5 ); diff --git a/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.fbp b/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.fbp index 2b95a77d9e..12d3a6837c 100644 --- a/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.fbp +++ b/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.fbp @@ -439,7 +439,7 @@ 0 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL + wxEXPAND 1 @@ -531,7 +531,7 @@ 5 - wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND + wxRIGHT|wxEXPAND 0 1 @@ -820,7 +820,7 @@ none 5 - wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL + wxALL 0 1 @@ -901,7 +901,7 @@ 5 - wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND + wxALL|wxEXPAND 0 1 @@ -1100,7 +1100,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALL + wxALL|wxALIGN_CENTER_VERTICAL 0 1 diff --git a/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.h b/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.h index 7c7431e71f..9cc647eff1 100644 --- a/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.h +++ b/pcbnew/dialogs/wizard_3DShape_Libs_downloader_base.h @@ -1,8 +1,8 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 22 2017) +// C++ code generated with wxFormBuilder (version Aug 4 2017) // http://www.wxformbuilder.org/ // -// PLEASE DO *NOT* EDIT THIS FILE! +// PLEASE DO "NOT" EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// #ifndef __WIZARD_3DSHAPE_LIBS_DOWNLOADER_BASE_H__