diff options
| author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2018-08-08 15:58:15 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2018-08-09 07:19:12 +0000 |
| commit | 22669c64e2272c8b0af124e351b70a55c1985460 (patch) | |
| tree | 1136334908b5efb173176e4efa8abcac2f2dd87b /src/Authoring/Studio/Palettes/Timeline/Bindings | |
| parent | 6286e8451522e5e2b84d5b3c74d13d1cb40d4c1a (diff) | |
Prohibit setting duplicate or empty object name in inspector
Changing object name from inspector now does standard automatic
rename in case the parent object already has a child with the new name.
Task-number: QT3DS-2050
Change-Id: Iba33d0528f7e13db83ae4db2c068042e842d65e5
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/Authoring/Studio/Palettes/Timeline/Bindings')
| -rw-r--r-- | src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp index c02b798b..99be9332 100644 --- a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp +++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp @@ -347,14 +347,8 @@ void Qt3DSDMTimelineItemBinding::SetName(const Q3DStudio::CString &inName) Q3DStudio::SCOPED_DOCUMENT_EDITOR( *m_TransMgr->GetDoc(), QObject::tr("Set Name"))->SetName(m_DataHandle, inName, true); - QString theTitle = QObject::tr("Warning"); - QString theString = QObject::tr("Object %1 was renamed to %2 because " - "original name was duplicated " - "under its parent.") - .arg(inName.toQString()) - .arg(theBridge->GetName(m_DataHandle).toQString()); - g_StudioApp.GetDialogs()->DisplayMessageBox(theTitle, theString, - Qt3DSMessageBox::ICON_WARNING, false); + g_StudioApp.GetDialogs()->DisplayObjectRenamed( + inName.toQString(), theBridge->GetName(m_DataHandle).toQString()); return; } |