From af6e41d8cc844d18eb0dfeab79631638a276163c Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 23 Aug 2017 15:26:48 +0300 Subject: [PATCH] Fix bug. Valentina doesn't update piece label. --HG-- branch : develop --- src/app/valentina/dialogs/dialogpatternproperties.cpp | 4 +++- src/app/valentina/mainwindow.cpp | 2 ++ src/libs/ifc/xml/vabstractpattern.cpp | 1 - src/libs/vtools/tools/vtoolseamallowance.cpp | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/app/valentina/dialogs/dialogpatternproperties.cpp b/src/app/valentina/dialogs/dialogpatternproperties.cpp index 94f82808d..8619ea58a 100644 --- a/src/app/valentina/dialogs/dialogpatternproperties.cpp +++ b/src/app/valentina/dialogs/dialogpatternproperties.cpp @@ -219,6 +219,7 @@ void DialogPatternProperties::Apply() case 3: SaveLabelData(); SaveTemplateData(); + emit doc->UpdatePatternLabel(); break; default: break; @@ -235,6 +236,8 @@ void DialogPatternProperties::Ok() SaveLabelData(); SaveTemplateData(); + emit doc->UpdatePatternLabel(); + close(); } @@ -546,7 +549,6 @@ void DialogPatternProperties::SaveDescription() descriptionChanged = false; emit doc->patternChanged(false); - emit doc->UpdatePatternLabel(); } } diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index e271f55b8..e57019ee8 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -1625,6 +1625,7 @@ void MainWindow::UnloadMeasurements() } qApp->setPatternType(MeasurementsType::Unknown); doc->SetMPath(QString()); + emit doc->UpdatePatternLabel(); PatternChangesWereSaved(false); ui->actionEditCurrent->setEnabled(false); ui->actionUnloadMeasurements->setDisabled(true); @@ -3419,6 +3420,7 @@ bool MainWindow::SavePattern(const QString &fileName, QString &error) else { doc->SetMPath(mPath); + emit doc->UpdatePatternLabel(); qCDebug(vMainWindow, "Could not save file %s. %s.", qUtf8Printable(fileName), qUtf8Printable(error)); } return result; diff --git a/src/libs/ifc/xml/vabstractpattern.cpp b/src/libs/ifc/xml/vabstractpattern.cpp index 3de77e6eb..2e7857fa6 100644 --- a/src/libs/ifc/xml/vabstractpattern.cpp +++ b/src/libs/ifc/xml/vabstractpattern.cpp @@ -797,7 +797,6 @@ void VAbstractPattern::SetMPath(const QString &path) if (setTagText(TagMeasurements, path)) { emit patternChanged(false); - emit UpdatePatternLabel(); } else { diff --git a/src/libs/vtools/tools/vtoolseamallowance.cpp b/src/libs/vtools/tools/vtoolseamallowance.cpp index 5ac438b1e..76af85a50 100644 --- a/src/libs/vtools/tools/vtoolseamallowance.cpp +++ b/src/libs/vtools/tools/vtoolseamallowance.cpp @@ -1148,6 +1148,7 @@ VToolSeamAllowance::VToolSeamAllowance(VAbstractPattern *doc, VContainer *data, connect(m_grainLine, &VGrainlineItem::SignalRotated, this, &VToolSeamAllowance::SaveRotateGrainline); connect(doc, &VAbstractPattern::UpdatePatternLabel, this, &VToolSeamAllowance::UpdatePatternInfo); + connect(doc, &VAbstractPattern::UpdatePatternLabel, this, &VToolSeamAllowance::UpdateDetailLabel); connect(doc, &VAbstractPattern::CheckLayout, this, &VToolSeamAllowance::UpdateDetailLabel); connect(doc, &VAbstractPattern::CheckLayout, this, &VToolSeamAllowance::UpdatePatternInfo); connect(doc, &VAbstractPattern::CheckLayout, this, &VToolSeamAllowance::UpdateGrainline);