palo/valentina
1
0
Fork 0
mirror of https://gitlab.com/smart-pattern/valentina.git synced 2024-09-18 23:04:03 +02:00
Code Issues Projects Releases Wiki Activity

Fix regression. Formula wizard dialog doesn't show item alias in a list.

Browse source
This commit is contained in:
Roman Telezhynskyi 2024-07-11 21:26:46 +03:00
parent 7711e61381
commit 12f17d5961
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog.txt
View file

@ -4,6 +4,7 @@
- Fix incorrect seam allowance. - Fix incorrect seam allowance.
- Duplicate controls for main path nodes. - Duplicate controls for main path nodes.
- Fix compatibility with macOS 12+. - 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 # Valentina 0.7.53 June 25, 2024
- Fix layout sheet export with empty name. - Fix layout sheet export with empty name.

16
src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp
View file

@ -628,6 +628,8 @@ template <class T> void DialogEditWrongFormula::ShowVariable(const QList<T> &var
const VTranslateVars *trVars = VAbstractApplication::VApp()->TrVars(); const VTranslateVars *trVars = VAbstractApplication::VApp()->TrVars();
QSet<QString> processedNames;
for (const auto &var : vars) for (const auto &var : vars)
{ {
if (ui->checkBoxHideEmpty->isEnabled() && ui->checkBoxHideEmpty->isChecked() && var->IsNotUsed()) if (ui->checkBoxHideEmpty->isEnabled() && ui->checkBoxHideEmpty->isChecked() && var->IsNotUsed())
@ -637,8 +639,20 @@ template <class T> void DialogEditWrongFormula::ShowVariable(const QList<T> &var
if (!var->Filter(m_toolId)) if (!var->Filter(m_toolId))
{ // If we create this variable don't show { // 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); 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(); QFont font = item->font();
font.setBold(true); font.setBold(true);
item->setFont(font); item->setFont(font);