From 12f17d59619e032490596875ac07792229ca0343 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 11 Jul 2024 21:26:46 +0300 Subject: [PATCH] Fix regression. Formula wizard dialog doesn't show item alias in a list. --- ChangeLog.txt | 1 + .../dialogs/support/dialogeditwrongformula.cpp | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 6f91e2465..f5055bae2 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -4,6 +4,7 @@ - Fix incorrect seam allowance. - Duplicate controls for main path nodes. - Fix compatibility with macOS 12+. +- Fix regression. Formula wizard dialog doesn't show item alias in a list. # Valentina 0.7.53 June 25, 2024 - Fix layout sheet export with empty name. diff --git a/src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp b/src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp index e33819f6d..9417a3b6f 100644 --- a/src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp +++ b/src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp @@ -628,6 +628,8 @@ template void DialogEditWrongFormula::ShowVariable(const QList &var const VTranslateVars *trVars = VAbstractApplication::VApp()->TrVars(); + QSet processedNames; + for (const auto &var : vars) { if (ui->checkBoxHideEmpty->isEnabled() && ui->checkBoxHideEmpty->isChecked() && var->IsNotUsed()) @@ -637,8 +639,20 @@ template void DialogEditWrongFormula::ShowVariable(const QList &var if (!var->Filter(m_toolId)) { // If we create this variable don't show + QString name = var->GetName(); + if (processedNames.contains(name)) + { + name = var->GetAlias(); + if (name.isEmpty() || processedNames.contains(name)) + { + continue; + } + } + + processedNames.insert(name); + ui->tableWidget->setRowCount(ui->tableWidget->rowCount() + 1); - auto *item = new QTableWidgetItem(trVars->VarToUser(var->GetName())); + auto *item = new QTableWidgetItem(trVars->VarToUser(name)); QFont font = item->font(); font.setBold(true); item->setFont(font);