diff -Nru kicad-202205071717+99cc2e6832~118~ubuntu18.04.1/debian/changelog kicad-202205081717+8f937b17a2~118~ubuntu18.04.1/debian/changelog --- kicad-202205071717+99cc2e6832~118~ubuntu18.04.1/debian/changelog 2022-05-07 17:17:36.000000000 +0000 +++ kicad-202205081717+8f937b17a2~118~ubuntu18.04.1/debian/changelog 2022-05-08 17:17:44.000000000 +0000 @@ -1,8 +1,8 @@ -kicad (202205071717+99cc2e6832~118~ubuntu18.04.1) bionic; urgency=low +kicad (202205081717+8f937b17a2~118~ubuntu18.04.1) bionic; urgency=low * Auto build. - -- Jean-Samuel Reynaud Sat, 07 May 2022 17:17:36 +0000 + -- Jean-Samuel Reynaud Sun, 08 May 2022 17:17:44 +0000 kicad (3.9.9-16) unstable; urgency=medium diff -Nru kicad-202205071717+99cc2e6832~118~ubuntu18.04.1/debian/git-build-recipe.manifest kicad-202205081717+8f937b17a2~118~ubuntu18.04.1/debian/git-build-recipe.manifest --- kicad-202205071717+99cc2e6832~118~ubuntu18.04.1/debian/git-build-recipe.manifest 2022-05-07 17:17:36.000000000 +0000 +++ kicad-202205081717+8f937b17a2~118~ubuntu18.04.1/debian/git-build-recipe.manifest 2022-05-08 17:17:44.000000000 +0000 @@ -1,3 +1,3 @@ -# git-build-recipe format 0.4 deb-version 202205071717+99cc2e6832~118 +# git-build-recipe format 0.4 deb-version 202205081717+8f937b17a2~118 lp:~kicad/+git/kicad-daily-package-mirror-gitlab git-commit:c4a7a9e72c2d0ea3396d8957941f90cfcdd52595 -nest kicad lp:kicad kicad git-commit:99cc2e68320a13de831b1ffb65ee95e931d52281 +nest kicad lp:kicad kicad git-commit:8f937b17a27ec77538f982e48eb1cca7a604f5cd diff -Nru kicad-202205071717+99cc2e6832~118~ubuntu18.04.1/kicad/eeschema/dialogs/dialog_label_properties.cpp kicad-202205081717+8f937b17a2~118~ubuntu18.04.1/kicad/eeschema/dialogs/dialog_label_properties.cpp --- kicad-202205071717+99cc2e6832~118~ubuntu18.04.1/kicad/eeschema/dialogs/dialog_label_properties.cpp 2022-05-07 17:17:35.000000000 +0000 +++ kicad-202205081717+8f937b17a2~118~ubuntu18.04.1/kicad/eeschema/dialogs/dialog_label_properties.cpp 2022-05-08 17:17:43.000000000 +0000 @@ -228,7 +228,12 @@ if( m_activeTextEntry ) { // show control characters in a human-readable format - m_activeTextEntry->SetValue( UnescapeString( m_currentLabel->GetText() ) ); + wxString text = UnescapeString( m_currentLabel->GetText() ); + + // show text variable cross-references in a human-readable format + text = m_currentLabel->Schematic()->ConvertKIIDsToRefs( text ); + + m_activeTextEntry->SetValue( text ); } if( m_currentLabel->Type() == SCH_GLOBAL_LABEL_T || m_currentLabel->Type() == SCH_LABEL_T ) @@ -403,6 +408,9 @@ // labels need escaping text = EscapeString( m_activeTextEntry->GetValue(), CTX_NETNAME ); + // convert any text variable cross-references to their UUIDs + text = m_currentLabel->Schematic()->ConvertRefsToKIIDs( text ); + #ifdef __WXMAC__ // On macOS CTRL+Enter produces '\r' instead of '\n' regardless of EOL setting text.Replace( "\r", "\n" ); diff -Nru kicad-202205071717+99cc2e6832~118~ubuntu18.04.1/kicad/eeschema/dialogs/panel_sym_lib_table.cpp kicad-202205081717+8f937b17a2~118~ubuntu18.04.1/kicad/eeschema/dialogs/panel_sym_lib_table.cpp --- kicad-202205071717+99cc2e6832~118~ubuntu18.04.1/kicad/eeschema/dialogs/panel_sym_lib_table.cpp 2022-05-07 17:17:36.000000000 +0000 +++ kicad-202205081717+8f937b17a2~118~ubuntu18.04.1/kicad/eeschema/dialogs/panel_sym_lib_table.cpp 2022-05-08 17:17:43.000000000 +0000 @@ -313,11 +313,6 @@ PANEL_SYM_LIB_TABLE::~PANEL_SYM_LIB_TABLE() { - // When the dialog is closed it will hide the current notebook page first, which will - // in turn select the other one. We then end up saving its index as the "current page". - // So flip them back again: - m_pageNdx = m_pageNdx == 1 ? 0 : 1; - // Delete the GRID_TRICKS. // Any additional event handlers should be popped before the window is deleted. m_global_grid->PopEventHandler( true ); diff -Nru kicad-202205071717+99cc2e6832~118~ubuntu18.04.1/kicad/eeschema/sch_label.cpp kicad-202205081717+8f937b17a2~118~ubuntu18.04.1/kicad/eeschema/sch_label.cpp --- kicad-202205071717+99cc2e6832~118~ubuntu18.04.1/kicad/eeschema/sch_label.cpp 2022-05-07 17:17:36.000000000 +0000 +++ kicad-202205081717+8f937b17a2~118~ubuntu18.04.1/kicad/eeschema/sch_label.cpp 2022-05-08 17:17:43.000000000 +0000 @@ -447,6 +447,12 @@ bool SCH_LABEL_BASE::ResolveTextVar( wxString* token, int aDepth ) const { + if( token->Contains( ':' ) ) + { + if( Schematic()->ResolveCrossReference( token, aDepth ) ) + return true; + } + if( ( Type() == SCH_GLOBAL_LABEL_T || Type() == SCH_HIER_LABEL_T || Type() == SCH_SHEET_PIN_T ) && token->IsSameAs( wxT( "CONNECTION_TYPE" ) ) ) { diff -Nru kicad-202205071717+99cc2e6832~118~ubuntu18.04.1/kicad/pcb_calculator/pcb_calculator_frame.cpp kicad-202205081717+8f937b17a2~118~ubuntu18.04.1/kicad/pcb_calculator/pcb_calculator_frame.cpp --- kicad-202205071717+99cc2e6832~118~ubuntu18.04.1/kicad/pcb_calculator/pcb_calculator_frame.cpp 2022-05-07 17:17:36.000000000 +0000 +++ kicad-202205081717+8f937b17a2~118~ubuntu18.04.1/kicad/pcb_calculator/pcb_calculator_frame.cpp 2022-05-08 17:17:43.000000000 +0000 @@ -46,11 +46,11 @@ PCB_CALCULATOR_FRAME::PCB_CALCULATOR_FRAME( KIWAY* aKiway, wxWindow* aParent ) : KIWAY_PLAYER( aParent, wxID_ANY, - _( "PCB Calculator" ), // Window title + _( "Calculator Tools" ), // Window title wxDefaultPosition, wxSize( 646,361 ), // Default size wxDEFAULT_FRAME_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE | wxTAB_TRAVERSAL, - wxT( "pcb_calculator" ) ), // Window name + wxT( "calculator_tools" ) ), // Window name m_lastNotebookPage( -1 ) { SHAPE_POLY_SET dummy; // A ugly trick to force the linker to include diff -Nru kicad-202205071717+99cc2e6832~118~ubuntu18.04.1/kicad/pcbnew/dialogs/panel_fp_lib_table.cpp kicad-202205081717+8f937b17a2~118~ubuntu18.04.1/kicad/pcbnew/dialogs/panel_fp_lib_table.cpp --- kicad-202205071717+99cc2e6832~118~ubuntu18.04.1/kicad/pcbnew/dialogs/panel_fp_lib_table.cpp 2022-05-07 17:17:36.000000000 +0000 +++ kicad-202205081717+8f937b17a2~118~ubuntu18.04.1/kicad/pcbnew/dialogs/panel_fp_lib_table.cpp 2022-05-08 17:17:43.000000000 +0000 @@ -503,11 +503,6 @@ PANEL_FP_LIB_TABLE::~PANEL_FP_LIB_TABLE() { - // When the dialog is closed it will hide the current notebook page first, which will - // in turn select the other one. We then end up saving its index as the "current page". - // So flip them back again: - m_pageNdx = m_pageNdx == 1 ? 0 : 1; - // Delete the GRID_TRICKS. // Any additional event handlers should be popped before the window is deleted. m_global_grid->PopEventHandler( true ); diff -Nru kicad-202205071717+99cc2e6832~118~ubuntu18.04.1/kicad/pcbnew/drc/drc_rule_parser.cpp kicad-202205081717+8f937b17a2~118~ubuntu18.04.1/kicad/pcbnew/drc/drc_rule_parser.cpp --- kicad-202205071717+99cc2e6832~118~ubuntu18.04.1/kicad/pcbnew/drc/drc_rule_parser.cpp 2022-05-07 17:17:36.000000000 +0000 +++ kicad-202205081717+8f937b17a2~118~ubuntu18.04.1/kicad/pcbnew/drc/drc_rule_parser.cpp 2022-05-08 17:17:43.000000000 +0000 @@ -327,10 +327,6 @@ case T_diff_pair_uncoupled: c.m_Type = DIFF_PAIR_MAX_UNCOUPLED_CONSTRAINT; break; case T_physical_clearance: c.m_Type = PHYSICAL_CLEARANCE_CONSTRAINT; break; case T_physical_hole_clearance: c.m_Type = PHYSICAL_HOLE_CLEARANCE_CONSTRAINT; break; - // legacy tokens: - case T_hole: c.m_Type = HOLE_SIZE_CONSTRAINT; break; - case T_mechanical_clearance: c.m_Type = PHYSICAL_CLEARANCE_CONSTRAINT; break; - case T_mechanical_hole_clearance: c.m_Type = PHYSICAL_HOLE_CLEARANCE_CONSTRAINT; break; default: msg.Printf( _( "Unrecognized item '%s'.| Expected %s." ), FromUTF8(), wxT( "assertion, clearance, hole_clearance, edge_clearance, "