From 4efa13a3e36444b74ae5ef0b2916a8ef34f4b754 Mon Sep 17 00:00:00 2001 From: aris-kimi Date: Wed, 7 Sep 2022 02:12:10 +0300 Subject: [PATCH] Change Loss Tg to Loss Tan. Fixes: https://gitlab.com/kicad/code/kicad/-/issues/10699 --- .../dialog_dielectric_list_manager.cpp | 2 +- .../dialog_dielectric_list_manager_base.cpp | 4 ++-- .../dialog_dielectric_list_manager_base.fbp | 7 +++++-- .../dialog_dielectric_list_manager_base.h | 5 +++-- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/pcbnew/board_stackup_manager/dialog_dielectric_list_manager.cpp b/pcbnew/board_stackup_manager/dialog_dielectric_list_manager.cpp index 705fbb5a59..132382639c 100644 --- a/pcbnew/board_stackup_manager/dialog_dielectric_list_manager.cpp +++ b/pcbnew/board_stackup_manager/dialog_dielectric_list_manager.cpp @@ -92,7 +92,7 @@ void DIALOG_DIELECTRIC_MATERIAL::initMaterialList() { m_lcMaterials->AppendColumn( _( "Material" ) ); m_lcMaterials->AppendColumn( _( "Epsilon R" ) ); - m_lcMaterials->AppendColumn( _( "Loss Tg" ) ); + m_lcMaterials->AppendColumn( _( "Loss Tan" ) ); m_lcMaterials->SetColumnWidth( 0, m_lcMaterials->GetColumnWidth( 1 ) * 3 / 2 ); diff --git a/pcbnew/board_stackup_manager/dialog_dielectric_list_manager_base.cpp b/pcbnew/board_stackup_manager/dialog_dielectric_list_manager_base.cpp index 1f3a6185b5..105a7f4e1a 100644 --- a/pcbnew/board_stackup_manager/dialog_dielectric_list_manager_base.cpp +++ b/pcbnew/board_stackup_manager/dialog_dielectric_list_manager_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -36,7 +36,7 @@ DIALOG_DIELECTRIC_MATERIAL_BASE::DIALOG_DIELECTRIC_MATERIAL_BASE( wxWindow* pare m_staticTextEpsilonR->Wrap( -1 ); fgSizerNewDielectric->Add( m_staticTextEpsilonR, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - m_staticTextLossTg = new wxStaticText( this, wxID_ANY, _("Loss Tg:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextLossTg = new wxStaticText( this, wxID_ANY, _("Loss Tan:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextLossTg->Wrap( -1 ); fgSizerNewDielectric->Add( m_staticTextLossTg, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); diff --git a/pcbnew/board_stackup_manager/dialog_dielectric_list_manager_base.fbp b/pcbnew/board_stackup_manager/dialog_dielectric_list_manager_base.fbp index d73bb057cc..79cbb555a8 100644 --- a/pcbnew/board_stackup_manager/dialog_dielectric_list_manager_base.fbp +++ b/pcbnew/board_stackup_manager/dialog_dielectric_list_manager_base.fbp @@ -1,6 +1,6 @@ - + ; C++ @@ -14,6 +14,7 @@ dialog_dielectric_list_manager_base 1000 none + 1 DialogDielectricListManager @@ -25,6 +26,7 @@ 1 1 UI + 0 0 0 @@ -50,6 +52,7 @@ DIALOG_SHIM; dialog_shim.h; forward_declare Dielectric Material Characteristics + 0 @@ -246,7 +249,7 @@ 0 0 wxID_ANY - Loss Tg: + Loss Tan: 0 0 diff --git a/pcbnew/board_stackup_manager/dialog_dielectric_list_manager_base.h b/pcbnew/board_stackup_manager/dialog_dielectric_list_manager_base.h index 3bb91cdb01..3ca0a0802a 100644 --- a/pcbnew/board_stackup_manager/dialog_dielectric_list_manager_base.h +++ b/pcbnew/board_stackup_manager/dialog_dielectric_list_manager_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -48,13 +48,14 @@ class DIALOG_DIELECTRIC_MATERIAL_BASE : public DIALOG_SHIM wxButton* m_sdbSizerOK; wxButton* m_sdbSizerCancel; - // Virtual event handlers, overide them in your derived class + // Virtual event handlers, override them in your derived class virtual void onListItemSelected( wxListEvent& event ) { event.Skip(); } public: DIALOG_DIELECTRIC_MATERIAL_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Dielectric Material Characteristics"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + ~DIALOG_DIELECTRIC_MATERIAL_BASE(); };