From bcb786958ecaa2d820a96b91a7d4dbd0bb305a3b Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 2 Oct 2021 19:15:08 +0300 Subject: [PATCH] Show tooltip about defined user material in the label placeholder list. --- ChangeLog.txt | 1 + src/libs/vtools/dialogs/support/dialogeditlabel.cpp | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 29b4440a6..00608cb2e 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -11,6 +11,7 @@ - Fix incorrect comparison of the global length of passmark to minimal allowed value. - Make an increment name valid after user selected it from a completion list. - [smart-pattern/valentina#150] Fix Seam allowance not correct at intersection curve and axis. +- Show tooltip about defined user material in the label placeholder list. # Valentina 0.7.49 July 1, 2021 - Fix crash. diff --git a/src/libs/vtools/dialogs/support/dialogeditlabel.cpp b/src/libs/vtools/dialogs/support/dialogeditlabel.cpp index 49286f51d..933febe12 100644 --- a/src/libs/vtools/dialogs/support/dialogeditlabel.cpp +++ b/src/libs/vtools/dialogs/support/dialogeditlabel.cpp @@ -571,19 +571,25 @@ void DialogEditLabel::InitPlaceholders() VAbstractValApplication::VApp()->GetMeasurementsType() == MeasurementsType::Multisize ? QStringLiteral("vst") : QStringLiteral("vit"))); - const QString materialDescription = tr("User material"); + const QString userMaterialStr = tr("User material"); const QMap materials = m_doc->GetPatternMaterials(); for (int i = 0; i < userMaterialPlaceholdersQuantity; ++i) { const QString number = QString::number(i+1); + QString materialDescription; QString value; if (materials.contains(i + 1)) { value = materials.value(i + 1); + materialDescription = QStringLiteral("%1 %2 <%3>").arg(userMaterialStr, number, value); + } + else + { + materialDescription = QStringLiteral("%1 %2").arg(userMaterialStr, number); } - m_placeholders.insert(pl_userMaterial + number, qMakePair(materialDescription + number, value)); + m_placeholders.insert(pl_userMaterial + number, qMakePair(materialDescription, value)); } {