diff options
| author | Janne Kangas <janne.kangas@qt.io> | 2018-08-03 13:28:57 +0300 |
|---|---|---|
| committer | Janne Kangas <janne.kangas@qt.io> | 2018-08-03 10:43:30 +0000 |
| commit | e5fbc83ee42cf87880df95f54b056714d2852042 (patch) | |
| tree | 40c5a9c8f27d05ac7e0a7b2f556044fdb4d684f3 /src/Authoring/QT3DSDM/Systems/Qt3DSDMMetaData.cpp | |
| parent | cdc19299a8446001eb0d27dc1ee453a488dcdf50 (diff) | |
Add editable field for object name in inspector panel
Also, add pure String type to metadata and use proper handler for it in
QML. Add tooltip descriptions to Name and Eyeblla (Visibility) attributes.
Task-ID: QT3DS-1865
Task-ID: QT3DS-2012
Change-Id: Id7403b98fe4e8d81a26ea61f648d53ea885080bb
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/Authoring/QT3DSDM/Systems/Qt3DSDMMetaData.cpp')
| -rw-r--r-- | src/Authoring/QT3DSDM/Systems/Qt3DSDMMetaData.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMMetaData.cpp b/src/Authoring/QT3DSDM/Systems/Qt3DSDMMetaData.cpp index f509b216..9ac7a3ea 100644 --- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMMetaData.cpp +++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMMetaData.cpp @@ -96,6 +96,7 @@ namespace qt3dsdm { #define QT3DS_WCHAR_T_Renderable L"Renderable" #define QT3DS_WCHAR_T_PathBuffer L"PathBuffer" #define QT3DS_WCHAR_T_ShadowMapResolution L"ShadowMapResolution" +#define QT3DS_WCHAR_T_String L"String" #define ITERATE_ADDITIONAL_META_DATA_TYPES \ HANDLE_ADDITIONAL_META_DATA_TYPE(None) \ @@ -113,7 +114,8 @@ namespace qt3dsdm { HANDLE_ADDITIONAL_META_DATA_TYPE(Texture) \ HANDLE_ADDITIONAL_META_DATA_TYPE(Renderable) \ HANDLE_ADDITIONAL_META_DATA_TYPE(PathBuffer) \ - HANDLE_ADDITIONAL_META_DATA_TYPE(ShadowMapResolution) + HANDLE_ADDITIONAL_META_DATA_TYPE(ShadowMapResolution) \ + HANDLE_ADDITIONAL_META_DATA_TYPE(String) template <> struct WStrOps<AdditionalMetaDataType::Value> { @@ -203,7 +205,7 @@ bool WStrOps<HandlerArgumentType::Value>::StrTo(const wchar_t *buffer, HandlerAr HANDLE_QT3DSDM_COMPLETE_TYPE(Slide, None, DataModelDataType::String) \ HANDLE_QT3DSDM_COMPLETE_TYPE(Font, Font, DataModelDataType::String) \ HANDLE_QT3DSDM_COMPLETE_TYPE(FontSize, FontSize, DataModelDataType::Float) \ - HANDLE_QT3DSDM_COMPLETE_TYPE(String, None, DataModelDataType::String) \ + HANDLE_QT3DSDM_COMPLETE_TYPE(String, String, DataModelDataType::String) \ HANDLE_QT3DSDM_COMPLETE_TYPE(MultiLineString, MultiLine, DataModelDataType::String) \ HANDLE_QT3DSDM_COMPLETE_TYPE(ObjectRef, ObjectRef, DataModelDataType::ObjectRef) \ HANDLE_QT3DSDM_COMPLETE_TYPE(Image, Image, DataModelDataType::Long4) \ |