From a1c905381b2c162f22af6c7a3bfc206c930ef4f4 Mon Sep 17 00:00:00 2001 From: BojanKverh Date: Sat, 30 Jul 2016 13:21:03 +0200 Subject: [PATCH] Fixed label update on clicking OK in pattern properties dialog and the label is hidden when there is no text on it --HG-- branch : feature --- src/app/valentina/dialogs/dialogpatternproperties.cpp | 3 +++ src/libs/vtools/tools/vtextgraphicsitem.cpp | 10 ++++++++++ src/libs/vtools/tools/vtextgraphicsitem.h | 1 + src/libs/vtools/tools/vtooldetail.cpp | 9 ++++++++- 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/app/valentina/dialogs/dialogpatternproperties.cpp b/src/app/valentina/dialogs/dialogpatternproperties.cpp index 82e4889f3..6792ab260 100644 --- a/src/app/valentina/dialogs/dialogpatternproperties.cpp +++ b/src/app/valentina/dialogs/dialogpatternproperties.cpp @@ -188,6 +188,9 @@ DialogPatternProperties::DialogPatternProperties(const QString &filePath, VPatte connect(ui->lineEditPatternNumber, &QLineEdit::editingFinished, this, &DialogPatternProperties::GeneralInfoChanged); connect(ui->lineEditCompanyName, &QLineEdit::editingFinished, this, &DialogPatternProperties::GeneralInfoChanged); connect(ui->lineEditCustomerName, &QLineEdit::editingFinished, this, &DialogPatternProperties::GeneralInfoChanged); + connect(ui->lineEditSize, &QLineEdit::editingFinished, this, &DialogPatternProperties::GeneralInfoChanged); + connect(ui->checkBoxShowDate, &QCheckBox::stateChanged, this, &DialogPatternProperties::GeneralInfoChanged); + connect(ui->checkBoxShowMeasurements, &QCheckBox::stateChanged, this, &DialogPatternProperties::GeneralInfoChanged); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/vtextgraphicsitem.cpp b/src/libs/vtools/tools/vtextgraphicsitem.cpp index 06d1649fc..aa312ca32 100644 --- a/src/libs/vtools/tools/vtextgraphicsitem.cpp +++ b/src/libs/vtools/tools/vtextgraphicsitem.cpp @@ -293,6 +293,16 @@ void VTextGraphicsItem::UpdateData(const VAbstractPattern* pDoc) m_tm.Update(pDoc); } +//--------------------------------------------------------------------------------------------------------------------- +/** + * @brief VTextGraphicsItem::GetTextLines returns the number of lines of text to show + * @return number of lines of text + */ +int VTextGraphicsItem::GetTextLines() const +{ + return m_tm.GetCount(); +} + //--------------------------------------------------------------------------------------------------------------------- /** * @brief VTextGraphicsItem::GetFontSize returns the currently used text base font size diff --git a/src/libs/vtools/tools/vtextgraphicsitem.h b/src/libs/vtools/tools/vtextgraphicsitem.h index 0b1275894..c86b1a639 100644 --- a/src/libs/vtools/tools/vtextgraphicsitem.h +++ b/src/libs/vtools/tools/vtextgraphicsitem.h @@ -69,6 +69,7 @@ public: bool IsContained(QRectF rectBB, qreal dRot, qreal& dX, qreal& dY) const; void UpdateData(const QString& qsName, const VPatternPieceData& data); void UpdateData(const VAbstractPattern* pDoc); + int GetTextLines() const; protected: void mousePressEvent(QGraphicsSceneMouseEvent* pME); diff --git a/src/libs/vtools/tools/vtooldetail.cpp b/src/libs/vtools/tools/vtooldetail.cpp index bfbe238df..1d827e268 100644 --- a/src/libs/vtools/tools/vtooldetail.cpp +++ b/src/libs/vtools/tools/vtooldetail.cpp @@ -748,7 +748,14 @@ void VToolDetail::UpdatePatternInfo() patternInfo->setPos(pt); patternInfo->setRotation(geom.GetRotation()); patternInfo->Update(); - patternInfo->show(); + if (patternInfo->GetTextLines() > 0) + { + patternInfo->show(); + } + else + { + patternInfo->hide(); + } } else {