summaryrefslogtreecommitdiffstats
path: root/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp
diff options
context:
space:
mode:
authorJanne Kangas <janne.kangas@qt.io>2017-12-15 11:53:56 +0200
committerJanne Kangas <janne.kangas@qt.io>2018-01-19 10:20:50 +0000
commite3c6e9d38a5b6f729093fc0349784fa475af8f62 (patch)
tree310509fe958f7722139041f26e59de4480d98b2c /src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp
parent337aaa465ac78ac72ca748f0c2d4c3b6257829b8 (diff)
[DataInput] Update datainput control list when target is renamed
Update datainput control list when a controlled element changes name. Change-Id: I2c072aafd0850410ab71b4c81bc8e9774e4f5f20 Task-Id: QT3DS-337 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp')
-rw-r--r--src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp
index 609fb1d3..c9334798 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp
@@ -346,6 +346,7 @@ void Qt3DSDMTimelineItemBinding::SetName(const Q3DStudio::CString &inName)
return;
}
+ Q3DStudio::CString oldPath = GetObjectPath();
CClientDataModelBridge *theBridge = m_StudioSystem->GetClientDataModelBridge();
if (!theBridge->CheckNameUnique(m_DataHandle, inName)) {
QString theTitle = QObject::tr("Rename Object Error");
@@ -355,8 +356,12 @@ void Qt3DSDMTimelineItemBinding::SetName(const Q3DStudio::CString &inName)
theTitle, theString, Qt3DSMessageBox::ICON_WARNING);
if (theUserChoice == QMessageBox::Yes) {
// Set with the unique name
- Q3DStudio::SCOPED_DOCUMENT_EDITOR(*m_TransMgr->GetDoc(), QObject::tr("Set Name"))
- ->SetName(m_DataHandle, inName, true);
+ Q3DStudio::SCOPED_DOCUMENT_EDITOR(
+ *m_TransMgr->GetDoc(), QObject::tr("Set Name"))
+ ->SetName(m_DataHandle, inName, true);
+ Q3DStudio::SCOPED_DOCUMENT_EDITOR(
+ *m_TransMgr->GetDoc(), QObject::tr("Update DataInput target path"))
+ ->UpdateDataInputTarget(m_DataHandle, oldPath);
return;
}
}
@@ -364,9 +369,13 @@ void Qt3DSDMTimelineItemBinding::SetName(const Q3DStudio::CString &inName)
Qt3DSDMPropertyHandle theNamePropHandle =
m_StudioSystem->GetPropertySystem()->GetAggregateInstancePropertyByName(m_DataHandle,
L"name");
+
Q3DStudio::SCOPED_DOCUMENT_EDITOR(*m_TransMgr->GetDoc(), QObject::tr("Set Name"))
->SetInstancePropertyValue(m_DataHandle, theNamePropHandle,
std::make_shared<CDataStr>(inName));
+ Q3DStudio::SCOPED_DOCUMENT_EDITOR(*m_TransMgr->GetDoc(),
+ QObject::tr("Update DataInput target path"))
+ ->UpdateDataInputTarget(m_DataHandle, oldPath);
}
ITimelineItem *Qt3DSDMTimelineItemBinding::GetTimelineItem()