From c9a917eef1add8ceb2cd2f7df32417bc6466a06f Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Tue, 31 Mar 2015 13:14:21 +0200 Subject: [PATCH] 3d viewer: fix a few warning coverity (and a potential bug). fp libs wizard: make it internationalized, and replace an untranslatable string created by grouping 3 strings by one translatable string. --- 3d-viewer/3d_canvas.cpp | 21 +- 3d-viewer/vrml_aux.h | 2 +- 3d-viewer/vrml_v2_modelparser.cpp | 27 +- pcbnew/dialogs/wizard_add_fplib_base.cpp | 86 ++-- pcbnew/dialogs/wizard_add_fplib_base.fbp | 501 +++++++++-------------- pcbnew/dialogs/wizard_add_fplib_base.h | 15 +- 6 files changed, 267 insertions(+), 385 deletions(-) diff --git a/3d-viewer/3d_canvas.cpp b/3d-viewer/3d_canvas.cpp index 706014eb4a..6f3d57796b 100644 --- a/3d-viewer/3d_canvas.cpp +++ b/3d-viewer/3d_canvas.cpp @@ -73,6 +73,8 @@ BEGIN_EVENT_TABLE( EDA_3D_CANVAS, wxGLCanvas ) EVT_MENU_RANGE( ID_POPUP_3D_VIEW_START, ID_POPUP_3D_VIEW_END, EDA_3D_CANVAS::OnPopUpMenu ) END_EVENT_TABLE() +// Define an invalid value for some unsigned int indexes +#define INVALID_INDEX GL_INVALID_VALUE EDA_3D_CANVAS::EDA_3D_CANVAS( EDA_3D_FRAME* parent, int* attribList ) : wxGLCanvas( parent, wxID_ANY, attribList, wxDefaultPosition, wxDefaultSize, @@ -83,11 +85,10 @@ EDA_3D_CANVAS::EDA_3D_CANVAS( EDA_3D_FRAME* parent, int* attribList ) : m_shadow_init = false; // set an invalide value to not yet initialized indexes managing // textures created to enhance 3D rendering - // (they are dummy values but we do not want uninitialized values) - m_text_pcb = m_text_silk = -1; - m_text_fake_shadow_front = -1; - m_text_fake_shadow_back = -1; - m_text_fake_shadow_board = -1; + m_text_pcb = m_text_silk = INVALID_INDEX; + m_text_fake_shadow_front = INVALID_INDEX; + m_text_fake_shadow_back = INVALID_INDEX; + m_text_fake_shadow_board = INVALID_INDEX; // position of the front and back layers // (will be initialized to a better value later) @@ -117,7 +118,7 @@ EDA_3D_CANVAS::~EDA_3D_CANVAS() for( unsigned int i = 0; i < m_model_parsers_list.size(); i++ ) if( m_model_parsers_list[i] ) delete m_model_parsers_list[i]; - + } @@ -141,13 +142,15 @@ void EDA_3D_CANVAS::ClearLists( int aGlList ) m_glLists[ii] = 0; } - if( m_text_fake_shadow_front >= 0 ) + // When m_text_fake_shadow_??? is set to INVALID_INDEX, textures are no yet + // created. + if( m_text_fake_shadow_front != INVALID_INDEX ) glDeleteTextures( 1, &m_text_fake_shadow_front ); - if( m_text_fake_shadow_back >= 0 ) + if( m_text_fake_shadow_back != INVALID_INDEX ) glDeleteTextures( 1, &m_text_fake_shadow_back ); - if( m_text_fake_shadow_board >= 0 ) + if( m_text_fake_shadow_board != INVALID_INDEX ) glDeleteTextures( 1, &m_text_fake_shadow_board ); m_shadow_init = false; diff --git a/3d-viewer/vrml_aux.h b/3d-viewer/vrml_aux.h index 24b9d480c2..e1c9da0584 100644 --- a/3d-viewer/vrml_aux.h +++ b/3d-viewer/vrml_aux.h @@ -85,7 +85,7 @@ int ParseVertex( FILE* File, glm::vec3 &dst_vertex ); * parse a float value * @param File file to read from * @param dst_float destination float - * @return int - Return the number of floats readed + * @return int - Return the number of floats readed (0 or 1) */ int ParseFloat( FILE* File, float *dst_float ); diff --git a/3d-viewer/vrml_v2_modelparser.cpp b/3d-viewer/vrml_v2_modelparser.cpp index 94c0ad9682..b44c673e4b 100644 --- a/3d-viewer/vrml_v2_modelparser.cpp +++ b/3d-viewer/vrml_v2_modelparser.cpp @@ -61,6 +61,7 @@ VRML2_MODEL_PARSER::VRML2_MODEL_PARSER( S3D_MODEL_PARSER* aModelParser ) m_debugSpacer = ""; m_counter_DEF_GROUP = 0; m_counter_USE_GROUP = 0; + m_discardLastGeometry = false; } @@ -228,7 +229,7 @@ int VRML2_MODEL_PARSER::loadFileModel( S3D_MESH *aTransformationModel ) else if( strcmp( text, "Shape" ) == 0 ) { m_model = new S3D_MESH(); - + S3D_MESH* save_ptr = m_model; if( read_Shape() == 0 ) @@ -279,7 +280,7 @@ int VRML2_MODEL_PARSER::loadFileModel( S3D_MESH *aTransformationModel ) { wxString groupName = groupIt->first; S3D_MESH* ptrModel = groupIt->second; - + if( ((ptrModel->m_Point.size() == 0) || (ptrModel->m_CoordIndex.size() == 0)) && (ptrModel->childs.size() == 0) ) @@ -304,7 +305,7 @@ int VRML2_MODEL_PARSER::loadFileModel( S3D_MESH *aTransformationModel ) int VRML2_MODEL_PARSER::read_Transform() { wxLogTrace( traceVrmlV2Parser, m_debugSpacer + wxT( "read_Transform" ) ); - + debug_enter(); char text[BUFLINE_SIZE]; @@ -326,7 +327,7 @@ int VRML2_MODEL_PARSER::read_Transform() if( strcmp( text, "Transform" ) == 0 ) { m_model = new S3D_MESH(); - + S3D_MESH* save_ptr = m_model; if( read_Transform() == 0 ) @@ -357,7 +358,7 @@ int VRML2_MODEL_PARSER::read_Transform() else if( strcmp( text, "translation" ) == 0 ) { ParseVertex( m_file, m_model->m_translation ); - + wxLogTrace( traceVrmlV2Parser, m_debugSpacer + wxT( "translation (%f,%f,%f)" ), m_model->m_translation.x, m_model->m_translation.y, @@ -550,7 +551,7 @@ int VRML2_MODEL_PARSER::read_Transform() } else { - + m_counter_USE_GROUP++; wxLogTrace( traceVrmlV2Parser, m_debugSpacer + wxT( "read_Transform: USE %s Add child model with %lu points, %lu coordIndex, %lu childs." ), @@ -622,25 +623,25 @@ int VRML2_MODEL_PARSER::read_Inline() } else { - wxLogTrace( traceVrmlV2Parser, m_debugSpacer + wxT( "URL Failed to open file as a full path: \"%s\", will try now a relative path..." ), filename ); + wxLogTrace( traceVrmlV2Parser, m_debugSpacer + wxT( "URL Failed to open file as a full path: \"%s\", will try now a relative path..." ), filename ); #ifdef __WINDOWS__ filename = m_Filename.GetPath() + '\\' + filename; #else filename = m_Filename.GetPath() + '/' + filename; #endif - - + + if( wxFileName::FileExists( filename ) ) { fileExists = true; } else { - wxLogTrace( traceVrmlV2Parser, m_debugSpacer + wxT( "URL Failed to open file: \"%s\"" ), filename ); + wxLogTrace( traceVrmlV2Parser, m_debugSpacer + wxT( "URL Failed to open file: \"%s\"" ), filename ); } } - + if( fileExists ) { // Will now create a new parser and set the default @@ -651,7 +652,7 @@ int VRML2_MODEL_PARSER::read_Inline() } else { - wxLogTrace( traceVrmlV2Parser, m_debugSpacer + wxT( "URL Failed to open file: %s" ), text ); + wxLogTrace( traceVrmlV2Parser, m_debugSpacer + wxT( "URL Failed to open file: %s" ), text ); } } else @@ -808,7 +809,7 @@ int VRML2_MODEL_PARSER::read_DEF() } else { - delete m_model; + delete m_model; } m_model = parent; diff --git a/pcbnew/dialogs/wizard_add_fplib_base.cpp b/pcbnew/dialogs/wizard_add_fplib_base.cpp index 718d1f531d..daa25d4957 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 Mar 9 2015) +// C++ code generated with wxFormBuilder (version Jun 5 2014) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -12,7 +12,7 @@ WIZARD_FPLIB_TABLE_BASE::WIZARD_FPLIB_TABLE_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxBitmap& bitmap, const wxPoint& pos, long style ) { this->Create( parent, id, title, bitmap, pos, style ); - this->SetSizeHints( wxSize( 720,480 ), wxDefaultSize ); + this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize ); wxWizardPageSimple* m_wizPage1 = new wxWizardPageSimple( this, NULL, NULL, wxArtProvider::GetBitmap( wxART_HELP_BOOK, wxART_FRAME_ICON ) ); m_pages.Add( m_wizPage1 ); @@ -28,37 +28,25 @@ WIZARD_FPLIB_TABLE_BASE::WIZARD_FPLIB_TABLE_BASE( wxWindow* parent, wxWindowID i fgSizer112->SetFlexibleDirection( wxBOTH ); fgSizer112->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_staticText1 = new wxStaticText( m_wizPage1, wxID_ANY, wxT("Welcome to the Add Footprint Libraries Wizard!\n\nPlease select the source for the libraries to add:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText1 = new wxStaticText( m_wizPage1, wxID_ANY, _("Welcome to the Add Footprint Libraries Wizard!\n\nPlease select the source for the libraries to add:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText1->Wrap( -1 ); fgSizer112->Add( m_staticText1, 1, wxALL|wxEXPAND, 5 ); wxBoxSizer* bSizer19; bSizer19 = new wxBoxSizer( wxVERTICAL ); - m_radioAddLocal = new wxRadioButton( m_wizPage1, wxID_ANY, wxT("Files on my computer"), wxDefaultPosition, wxDefaultSize, 0 ); + m_radioAddLocal = new wxRadioButton( m_wizPage1, wxID_ANY, _("Files on my computer"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer19->Add( m_radioAddLocal, 0, wxALL|wxEXPAND, 5 ); - wxBoxSizer* m_sizerGithub; - m_sizerGithub = new wxBoxSizer( wxHORIZONTAL ); - - - bSizer19->Add( m_sizerGithub, 0, wxEXPAND, 5 ); - - wxGridSizer* gSizer1; - gSizer1 = new wxGridSizer( 2, 2, 0, 0 ); - - - bSizer19->Add( gSizer1, 0, wxEXPAND, 5 ); - wxFlexGridSizer* m_githubSizer; m_githubSizer = new wxFlexGridSizer( 0, 2, 0, 0 ); m_githubSizer->SetFlexibleDirection( wxBOTH ); m_githubSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_radioAddGithub = new wxRadioButton( m_wizPage1, wxID_ANY, wxT("Github repository"), wxDefaultPosition, wxDefaultSize, 0 ); + 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, wxT("http://github.com/KiCad"), wxDefaultPosition, wxDefaultSize, 0 ); + m_textCtrlGithubURL = new wxTextCtrl( m_wizPage1, wxID_ANY, _("http://github.com/KiCad"), wxDefaultPosition, wxDefaultSize, 0 ); m_textCtrlGithubURL->SetMinSize( wxSize( 300,-1 ) ); m_githubSizer->Add( m_textCtrlGithubURL, 1, wxALL|wxEXPAND, 5 ); @@ -66,7 +54,7 @@ WIZARD_FPLIB_TABLE_BASE::WIZARD_FPLIB_TABLE_BASE( wxWindow* parent, wxWindowID i m_githubSizer->Add( 0, 0, 1, wxEXPAND, 5 ); - m_downloadGithub = new wxCheckBox( m_wizPage1, wxID_ANY, wxT("Save a local copy to:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_downloadGithub = new wxCheckBox( m_wizPage1, wxID_ANY, _("Save a local copy to:"), wxDefaultPosition, wxDefaultSize, 0 ); m_downloadGithub->SetValue(true); m_githubSizer->Add( m_downloadGithub, 0, wxALL, 5 ); @@ -82,7 +70,7 @@ WIZARD_FPLIB_TABLE_BASE::WIZARD_FPLIB_TABLE_BASE( wxWindow* parent, wxWindowID i bSizer9->Add( m_downloadDir, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - m_btnBrowse = new wxButton( m_wizPage1, wxID_ANY, wxT("Browse"), wxDefaultPosition, wxDefaultSize, 0 ); + m_btnBrowse = new wxButton( m_wizPage1, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer9->Add( m_btnBrowse, 0, wxALL, 5 ); @@ -91,7 +79,7 @@ WIZARD_FPLIB_TABLE_BASE::WIZARD_FPLIB_TABLE_BASE( wxWindow* parent, wxWindowID i m_githubSizer->Add( 0, 0, 1, wxEXPAND, 5 ); - m_invalidDir = new wxStaticText( m_wizPage1, wxID_ANY, wxT("It is not possible to write in the selected directory.\nPlease choose another one."), wxDefaultPosition, wxDefaultSize, 0 ); + m_invalidDir = new wxStaticText( m_wizPage1, wxID_ANY, _("It is not possible to write in the selected directory.\nPlease choose another one."), wxDefaultPosition, wxDefaultSize, 0 ); m_invalidDir->Wrap( -1 ); m_invalidDir->SetForegroundColour( wxColour( 255, 0, 0 ) ); @@ -103,28 +91,24 @@ WIZARD_FPLIB_TABLE_BASE::WIZARD_FPLIB_TABLE_BASE( wxWindow* parent, wxWindowID i fgSizer112->Add( bSizer19, 1, wxEXPAND, 5 ); - wxFlexGridSizer* fgSizer12; - fgSizer12 = new wxFlexGridSizer( 0, 3, 0, 0 ); - fgSizer12->SetFlexibleDirection( wxBOTH ); - fgSizer12->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - - m_staticText8 = new wxStaticText( m_wizPage1, wxID_ANY, wxT("Visit the official"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText8->Wrap( -1 ); - fgSizer12->Add( m_staticText8, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 ); - - m_hyperlink1 = new wxHyperlinkCtrl( m_wizPage1, wxID_ANY, wxT("Kicad repository on Github"), wxT("https://github.com/KiCad"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE ); - fgSizer12->Add( m_hyperlink1, 0, wxTOP|wxBOTTOM, 5 ); - - m_staticText9 = new wxStaticText( m_wizPage1, wxID_ANY, wxT("to find numerous footprint libraries!"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText9->Wrap( -1 ); - fgSizer12->Add( m_staticText9, 0, wxTOP|wxBOTTOM|wxALIGN_CENTER_VERTICAL, 5 ); - - - fgSizer112->Add( fgSizer12, 1, wxEXPAND, 5 ); - bSizer1->Add( fgSizer112, 1, wxEXPAND, 5 ); + wxBoxSizer* bSizerOfficialRepo; + bSizerOfficialRepo = new wxBoxSizer( wxHORIZONTAL ); + + m_bitmapRepo = new wxStaticBitmap( m_wizPage1, wxID_ANY, wxArtProvider::GetBitmap( wxART_INFORMATION, wxART_OTHER ), wxDefaultPosition, wxDefaultSize, 0 ); + bSizerOfficialRepo->Add( m_bitmapRepo, 0, wxALL, 5 ); + + + 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 ); + + + bSizer1->Add( bSizerOfficialRepo, 0, wxEXPAND, 5 ); + m_wizPage1->SetSizer( bSizer1 ); m_wizPage1->Layout(); @@ -134,7 +118,7 @@ WIZARD_FPLIB_TABLE_BASE::WIZARD_FPLIB_TABLE_BASE( wxWindow* parent, wxWindowID i wxBoxSizer* bSizer8; bSizer8 = new wxBoxSizer( wxVERTICAL ); - m_staticText7 = new wxStaticText( m_wizPage2_Local, wxID_ANY, wxT("Select files or folders to add:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText7 = new wxStaticText( m_wizPage2_Local, wxID_ANY, _("Select files or folders to add:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText7->Wrap( -1 ); bSizer8->Add( m_staticText7, 0, wxALL, 5 ); @@ -153,7 +137,7 @@ WIZARD_FPLIB_TABLE_BASE::WIZARD_FPLIB_TABLE_BASE( wxWindow* parent, wxWindowID i wxBoxSizer* bSizer111; bSizer111 = new wxBoxSizer( wxVERTICAL ); - m_staticText112 = new wxStaticText( m_wizPage2_Github, wxID_ANY, wxT("Select Github libraries to add:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText112 = new wxStaticText( m_wizPage2_Github, wxID_ANY, _("Select Github libraries to add:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText112->Wrap( -1 ); bSizer111->Add( m_staticText112, 0, wxALL|wxEXPAND, 5 ); @@ -164,10 +148,10 @@ WIZARD_FPLIB_TABLE_BASE::WIZARD_FPLIB_TABLE_BASE( wxWindow* parent, wxWindowID i wxBoxSizer* bSizer7; bSizer7 = new wxBoxSizer( wxHORIZONTAL ); - m_btnSelectAllGH = new wxButton( m_wizPage2_Github, wxID_ANY, wxT("Select all"), wxDefaultPosition, wxDefaultSize, 0 ); + m_btnSelectAllGH = new wxButton( m_wizPage2_Github, wxID_ANY, _("Select all"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer7->Add( m_btnSelectAllGH, 1, wxALL, 5 ); - m_btnUnselectAllGH = new wxButton( m_wizPage2_Github, wxID_ANY, wxT("Unselect all"), wxDefaultPosition, wxDefaultSize, 0 ); + m_btnUnselectAllGH = new wxButton( m_wizPage2_Github, wxID_ANY, _("Unselect all"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer7->Add( m_btnUnselectAllGH, 1, wxALL, 5 ); @@ -193,14 +177,14 @@ WIZARD_FPLIB_TABLE_BASE::WIZARD_FPLIB_TABLE_BASE( wxWindow* parent, wxWindowID i wxBoxSizer* bSizer1111; bSizer1111 = new wxBoxSizer( wxVERTICAL ); - m_staticText1121 = new wxStaticText( m_wizPage3_Review, wxID_ANY, wxT("Review and confirm the changes to the libraries:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText1121 = new wxStaticText( m_wizPage3_Review, wxID_ANY, _("Review and confirm the changes to the libraries:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText1121->Wrap( -1 ); 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( wxT("Library") ); - m_dvLibStatus = m_listCtrlReview->AppendTextColumn( wxT("Status") ); - m_dvLibFormat = m_listCtrlReview->AppendTextColumn( wxT("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 ); @@ -213,14 +197,14 @@ WIZARD_FPLIB_TABLE_BASE::WIZARD_FPLIB_TABLE_BASE( wxWindow* parent, wxWindowID i wxBoxSizer* bSizer12; bSizer12 = new wxBoxSizer( wxVERTICAL ); - m_staticText12 = new wxStaticText( m_wizPage4_SelectTarget, wxID_ANY, wxT("Where do you wish the new libraries to be added:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText12 = new wxStaticText( m_wizPage4_SelectTarget, wxID_ANY, _("Where do you wish the new libraries to be added:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText12->Wrap( -1 ); bSizer12->Add( m_staticText12, 0, wxALL|wxEXPAND, 5 ); - m_radioGlobal = new wxRadioButton( m_wizPage4_SelectTarget, wxID_ANY, wxT("To global library configuration (visible by all projects)"), wxDefaultPosition, wxDefaultSize, 0 ); + m_radioGlobal = new wxRadioButton( m_wizPage4_SelectTarget, wxID_ANY, _("To global library configuration (visible by all projects)"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer12->Add( m_radioGlobal, 0, wxALL|wxEXPAND, 5 ); - m_radioProject = new wxRadioButton( m_wizPage4_SelectTarget, wxID_ANY, wxT("To the current project only"), wxDefaultPosition, wxDefaultSize, 0 ); + m_radioProject = new wxRadioButton( m_wizPage4_SelectTarget, wxID_ANY, _("To the current project only"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer12->Add( m_radioProject, 0, wxALL|wxEXPAND, 5 ); diff --git a/pcbnew/dialogs/wizard_add_fplib_base.fbp b/pcbnew/dialogs/wizard_add_fplib_base.fbp index dd6f590c78..6d41c1c12a 100644 --- a/pcbnew/dialogs/wizard_add_fplib_base.fbp +++ b/pcbnew/dialogs/wizard_add_fplib_base.fbp @@ -14,7 +14,7 @@ wizard_add_fplib_base 1000 none - 0 + 1 MyProject1 . @@ -40,10 +40,10 @@ 0 wxID_ANY - 720,480 + -1,-1 WIZARD_FPLIB_TABLE_BASE - 720,480 + 720,417 wxCAPTION|wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER ; Add Footprint Libraries Wizard @@ -331,31 +331,6 @@ - - 5 - wxEXPAND - 0 - - - m_sizerGithub - wxHORIZONTAL - none - - - - 5 - wxEXPAND - 0 - - 2 - 0 - - gSizer1 - none - 2 - 0 - - 5 wxEXPAND @@ -938,282 +913,200 @@ + + + + 5 + wxEXPAND + 0 + + + bSizerOfficialRepo + wxHORIZONTAL + none 5 - wxEXPAND - 1 - - 3 - wxBOTH - - - 0 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + Load From Art Provider; wxART_INFORMATION; wxART_OTHER + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 - fgSizer12 - wxFLEX_GROWMODE_SPECIFIED - none - 0 - 0 - - 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Visit the official - - 0 - - - 0 - - 1 - m_staticText8 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxTOP|wxBOTTOM - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - - wxID_ANY - Kicad repository on Github - - 0 - - - 0 - - 1 - m_hyperlink1 - - 1 - - - protected - 1 - - Resizable - 1 - - wxHL_DEFAULT_STYLE - - 0 - - https://github.com/KiCad - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxTOP|wxBOTTOM|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - to find numerous footprint libraries! - - 0 - - - 0 - - 1 - m_staticText9 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + m_bitmapRepo + 1 + + + protected + 1 + + Resizable + 1 + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 10 + wxRIGHT|wxLEFT + 0 + + 0 + protected + 0 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + + wxID_ANY + Visit our official Kicad repository on Github and get more libraries + + 0 + + + 0 + + 1 + m_hyperlinkGithubKicad + + 1 + + + protected + 1 + + Resizable + 1 + + wxHL_DEFAULT_STYLE + + 0 + + https://github.com/KiCad + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + Load From Art Provider; wxART_HELP_BOOK; wxART_FRAME_ICON @@ -1257,16 +1150,16 @@ - + bSizer8 wxVERTICAL none - + 5 wxALL 0 - + 1 1 1 @@ -1345,11 +1238,11 @@ - + 5 wxEXPAND | wxALL 1 - + 1 1 1 @@ -1961,7 +1854,7 @@ - + Load From Art Provider; wxART_HELP_BOOK; wxART_FRAME_ICON @@ -2005,7 +1898,7 @@ - + bSizer1111 wxVERTICAL @@ -2093,11 +1986,11 @@ - + 5 wxALL|wxEXPAND 1 - + 1 diff --git a/pcbnew/dialogs/wizard_add_fplib_base.h b/pcbnew/dialogs/wizard_add_fplib_base.h index 54d85bd030..18c5daab26 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 Mar 9 2015) +// C++ code generated with wxFormBuilder (version Jun 5 2014) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -17,14 +18,15 @@ #include #include #include -#include #include #include #include -#include +#include #include #include #include +#include +#include #include #include #include @@ -52,9 +54,8 @@ class WIZARD_FPLIB_TABLE_BASE : public wxWizard wxStaticText* m_downloadDir; wxButton* m_btnBrowse; wxStaticText* m_invalidDir; - wxStaticText* m_staticText8; - wxHyperlinkCtrl* m_hyperlink1; - wxStaticText* m_staticText9; + wxStaticBitmap* m_bitmapRepo; + wxHyperlinkCtrl* m_hyperlinkGithubKicad; wxStaticText* m_staticText7; wxGenericDirCtrl* m_filePicker; wxStaticText* m_staticText112; @@ -84,7 +85,7 @@ class WIZARD_FPLIB_TABLE_BASE : public wxWizard public: - WIZARD_FPLIB_TABLE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Add Footprint Libraries Wizard"), const wxBitmap& bitmap = wxArtProvider::GetBitmap( wxART_HELP_BOOK, wxART_FRAME_ICON ), const wxPoint& pos = wxDefaultPosition, long style = wxCAPTION|wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER ); + WIZARD_FPLIB_TABLE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Add Footprint Libraries Wizard"), const wxBitmap& bitmap = wxArtProvider::GetBitmap( wxART_HELP_BOOK, wxART_FRAME_ICON ), const wxPoint& pos = wxDefaultPosition, long style = wxCAPTION|wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER ); WizardPages m_pages; ~WIZARD_FPLIB_TABLE_BASE();