From 042e5956c280a8e3370789bed04df7b9ffa85d9c Mon Sep 17 00:00:00 2001 From: Wayne Stambaugh Date: Sun, 1 Nov 2020 09:13:39 -0500 Subject: [PATCH] Fix library table dialog tab labels. --- eeschema/dialogs/panel_sym_lib_table.cpp | 3 --- eeschema/dialogs/panel_sym_lib_table_base.cpp | 6 +++--- eeschema/dialogs/panel_sym_lib_table_base.fbp | 8 ++++---- eeschema/dialogs/panel_sym_lib_table_base.h | 2 +- pcbnew/dialogs/panel_fp_lib_table.cpp | 3 --- pcbnew/dialogs/panel_fp_lib_table_base.cpp | 6 +++--- pcbnew/dialogs/panel_fp_lib_table_base.fbp | 6 +++--- pcbnew/dialogs/panel_fp_lib_table_base.h | 2 +- 8 files changed, 15 insertions(+), 21 deletions(-) diff --git a/eeschema/dialogs/panel_sym_lib_table.cpp b/eeschema/dialogs/panel_sym_lib_table.cpp index e06f12cd2c..7aa95bb914 100644 --- a/eeschema/dialogs/panel_sym_lib_table.cpp +++ b/eeschema/dialogs/panel_sym_lib_table.cpp @@ -287,9 +287,6 @@ PANEL_SYM_LIB_TABLE::PANEL_SYM_LIB_TABLE( DIALOG_EDIT_LIBRARY_TABLES* aParent, setupGrid( m_global_grid ); - m_notebook->SetPageText( 0, _( "Global Libraries" ) ); - m_notebook->SetPageText( 1, _( "Project Specific Libraries" ) ); - if( aProject ) { m_PrjTableFilename->SetLabel( aProjectTablePath ); diff --git a/eeschema/dialogs/panel_sym_lib_table_base.cpp b/eeschema/dialogs/panel_sym_lib_table_base.cpp index 4e05acdbc8..74ab936b03 100644 --- a/eeschema/dialogs/panel_sym_lib_table_base.cpp +++ b/eeschema/dialogs/panel_sym_lib_table_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.9.0 Jun 18 2020) +// C++ code generated with wxFormBuilder (version 3.9.0 Nov 1 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -72,7 +72,7 @@ PANEL_SYM_LIB_TABLE_BASE::PANEL_SYM_LIB_TABLE_BASE( wxWindow* parent, wxWindowID m_global_panel->SetSizer( m_global_sizer ); m_global_panel->Layout(); m_global_sizer->Fit( m_global_panel ); - m_notebook->AddPage( m_global_panel, _("a page"), false ); + m_notebook->AddPage( m_global_panel, _("Global Libraries"), true ); m_project_panel = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* m_project_sizer; m_project_sizer = new wxBoxSizer( wxVERTICAL ); @@ -124,7 +124,7 @@ PANEL_SYM_LIB_TABLE_BASE::PANEL_SYM_LIB_TABLE_BASE( wxWindow* parent, wxWindowID m_project_panel->SetSizer( m_project_sizer ); m_project_panel->Layout(); m_project_sizer->Fit( m_project_panel ); - m_notebook->AddPage( m_project_panel, _("a page"), true ); + m_notebook->AddPage( m_project_panel, _("Project Specific Libraries"), false ); m_top_sizer->Add( m_notebook, 1, wxEXPAND | wxALL, 5 ); diff --git a/eeschema/dialogs/panel_sym_lib_table_base.fbp b/eeschema/dialogs/panel_sym_lib_table_base.fbp index f3c7c29a13..9e8de432a7 100644 --- a/eeschema/dialogs/panel_sym_lib_table_base.fbp +++ b/eeschema/dialogs/panel_sym_lib_table_base.fbp @@ -128,8 +128,8 @@ pageChangedHandler - a page - 0 + Global Libraries + 1 1 1 @@ -419,8 +419,8 @@ - a page - 1 + Project Specific Libraries + 0 1 1 diff --git a/eeschema/dialogs/panel_sym_lib_table_base.h b/eeschema/dialogs/panel_sym_lib_table_base.h index 969f6eeada..7e6f28eadf 100644 --- a/eeschema/dialogs/panel_sym_lib_table_base.h +++ b/eeschema/dialogs/panel_sym_lib_table_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.9.0 Jun 18 2020) +// C++ code generated with wxFormBuilder (version 3.9.0 Nov 1 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/pcbnew/dialogs/panel_fp_lib_table.cpp b/pcbnew/dialogs/panel_fp_lib_table.cpp index 5c7a057513..4b911d2fa8 100644 --- a/pcbnew/dialogs/panel_fp_lib_table.cpp +++ b/pcbnew/dialogs/panel_fp_lib_table.cpp @@ -436,9 +436,6 @@ PANEL_FP_LIB_TABLE::PANEL_FP_LIB_TABLE( DIALOG_EDIT_LIBRARY_TABLES* aParent, populateEnvironReadOnlyTable(); - m_notebook->SetPageText( 0, _( "Global Libraries" ) ); - m_notebook->SetPageText( 1, _( "Project Specific Libraries" ) ); - if( aProject ) { m_PrjTableFilename->SetLabel( aProjectTblPath ); diff --git a/pcbnew/dialogs/panel_fp_lib_table_base.cpp b/pcbnew/dialogs/panel_fp_lib_table_base.cpp index ebb6bec3b7..e62a1904c0 100644 --- a/pcbnew/dialogs/panel_fp_lib_table_base.cpp +++ b/pcbnew/dialogs/panel_fp_lib_table_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.9.0 Jun 18 2020) +// C++ code generated with wxFormBuilder (version 3.9.0 Nov 1 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -71,7 +71,7 @@ PANEL_FP_LIB_TABLE_BASE::PANEL_FP_LIB_TABLE_BASE( wxWindow* parent, wxWindowID i m_global_panel->SetSizer( m_global_sizer ); m_global_panel->Layout(); m_global_sizer->Fit( m_global_panel ); - m_notebook->AddPage( m_global_panel, _("a page"), false ); + m_notebook->AddPage( m_global_panel, _("Global Libraries"), true ); m_project_panel = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* m_project_sizer; m_project_sizer = new wxBoxSizer( wxVERTICAL ); @@ -123,7 +123,7 @@ PANEL_FP_LIB_TABLE_BASE::PANEL_FP_LIB_TABLE_BASE( wxWindow* parent, wxWindowID i m_project_panel->SetSizer( m_project_sizer ); m_project_panel->Layout(); m_project_sizer->Fit( m_project_panel ); - m_notebook->AddPage( m_project_panel, _("a page"), false ); + m_notebook->AddPage( m_project_panel, _("Project Specific Libraries"), false ); m_top_sizer->Add( m_notebook, 1, wxEXPAND | wxALL, 5 ); diff --git a/pcbnew/dialogs/panel_fp_lib_table_base.fbp b/pcbnew/dialogs/panel_fp_lib_table_base.fbp index 839dd4091e..37c8e8622a 100644 --- a/pcbnew/dialogs/panel_fp_lib_table_base.fbp +++ b/pcbnew/dialogs/panel_fp_lib_table_base.fbp @@ -128,8 +128,8 @@ pageChangedHandler - a page - 0 + Global Libraries + 1 1 1 @@ -419,7 +419,7 @@ - a page + Project Specific Libraries 0 1 diff --git a/pcbnew/dialogs/panel_fp_lib_table_base.h b/pcbnew/dialogs/panel_fp_lib_table_base.h index addc9d613a..5d2b85dad4 100644 --- a/pcbnew/dialogs/panel_fp_lib_table_base.h +++ b/pcbnew/dialogs/panel_fp_lib_table_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.9.0 Jun 18 2020) +// C++ code generated with wxFormBuilder (version 3.9.0 Nov 1 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE!