From 37a28a4629d9729527151993f0f353c81d9f3e28 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi <kroluku@gmail.com> Date: Wed, 31 May 2017 10:55:39 +0300 Subject: [PATCH] Fixed issue #697. Incomplete Internal Path for Waist Dart. (grafted from 1f17c5a2e540f1b1c27dab709bae1570fb170ed9) --HG-- branch : develop --- ChangeLog.txt | 1 + src/libs/vtools/dialogs/tools/piece/dialogpiecepath.cpp | 4 ++-- src/libs/vtools/dialogs/tools/piece/dialogpiecepath.ui | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index ac828d8aa..5bcf4316d 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -14,6 +14,7 @@ - Tab Pins moved to be second in the list after tab Paths. - Added tooltip for tab Passmark. Explained meaning of check box "Show the second passmark on seam line". - [#696] Wrong grainline position on layout. +- [#697] Incomplete Internal Path for Waist Dart. # Version 0.5.0 May 9, 2017 - [#581] User can now filter input lists by keyword in function wizard. diff --git a/src/libs/vtools/dialogs/tools/piece/dialogpiecepath.cpp b/src/libs/vtools/dialogs/tools/piece/dialogpiecepath.cpp index ced756586..07f711a79 100644 --- a/src/libs/vtools/dialogs/tools/piece/dialogpiecepath.cpp +++ b/src/libs/vtools/dialogs/tools/piece/dialogpiecepath.cpp @@ -1134,9 +1134,9 @@ bool DialogPiecePath::PathIsValid() const ui->helpLabel->setText(url); return false; } - else if (not EachPointLabelIsUnique(ui->listWidget)) + else if (GetType() == PiecePathType::CustomSeamAllowance && not EachPointLabelIsUnique(ui->listWidget)) { - url += tr("Each point in the path must be unique!"); + url += tr("Each point in the <b>custom seam allowance</b> path must be unique!"); ui->helpLabel->setText(url); return false; } diff --git a/src/libs/vtools/dialogs/tools/piece/dialogpiecepath.ui b/src/libs/vtools/dialogs/tools/piece/dialogpiecepath.ui index 51812884f..cd09bea58 100644 --- a/src/libs/vtools/dialogs/tools/piece/dialogpiecepath.ui +++ b/src/libs/vtools/dialogs/tools/piece/dialogpiecepath.ui @@ -113,6 +113,9 @@ <property name="scaledContents"> <bool>false</bool> </property> + <property name="wordWrap"> + <bool>true</bool> + </property> </widget> </item> </layout>