summaryrefslogtreecommitdiffstats
path: root/src/Runtime/res
diff options
context:
space:
mode:
authorMahmoud Badri <mahmoud.badri@qt.io>2019-04-10 11:11:17 +0300
committerMahmoud Badri <mahmoud.badri@qt.io>2019-04-11 10:04:47 +0000
commit0548bdbbd3e18cbb045ed29378487f5690d05e8c (patch)
tree1bb0272181b916baa26707dfd8d6b9ee0fe84602 /src/Runtime/res
parent00b40db9326f0b951b423a97b7302d87280f029b (diff)
Support variants property on components
Also the following tasks are done in this commit: - show active root component properties in the inspector. - fix a crash when opening the light scope drop down. - remove a lot of dynamic casts and useless code and cleanups, mainly from the inspector classes. There is still more dynamic casts and memory leaks that should be tackled in another commit. - move a method to more appropriate place. Change-Id: I5bec3858ba34d307ab6236ee665f1474302c1f57 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/Runtime/res')
-rw-r--r--src/Runtime/res/DataModelMetadata/en-us/MetaData.xml35
1 files changed, 25 insertions, 10 deletions
diff --git a/src/Runtime/res/DataModelMetadata/en-us/MetaData.xml b/src/Runtime/res/DataModelMetadata/en-us/MetaData.xml
index 2df33774..c5b99119 100644
--- a/src/Runtime/res/DataModelMetadata/en-us/MetaData.xml
+++ b/src/Runtime/res/DataModelMetadata/en-us/MetaData.xml
@@ -55,7 +55,17 @@
<Property name="scaleanchor" formalName="Scale Anchor" description="Corner of the content to pin as the\nlayer size changes" list="Center:N:NE:E:SE:S:SW:W:NW" default="Center"/>
</Camera>
<Component>
- <!--<Property name="name" formalName="Name" description="Object name" type="String" default="Component" hidden="False" />-->
+ <!-- Basic Properties -->
+ <Property name="name" formalName="Name" type="String" default="Model" category="Basic Properties" description="Object name" />
+ <Property name="eyeball" formalName="Visible" type="Boolean" default="True" category="Basic Properties" description="Item visibility" />
+ <Property name="position" formalName="Position" type="Vector" category="Basic Properties" description="Location in local space" />
+ <Property name="rotation" formalName="Rotation" type="Rotation" category="Basic Properties" description="Rotation around local axes" />
+ <Property name="scale" formalName="Scale" type="Vector" default="1 1 1" category="Basic Properties" description="Size adjustments along local axes" />
+ <Property name="pivot" formalName="Pivot" type="Vector" category="Basic Properties" description="Offset of the contents away from the local center" />
+ <Property name="opacity" formalName="Opacity" min="0" max="100" default="100" category="Basic Properties" />
+
+ <!-- Variant Tags -->
+ <Property name="variants" type="String" animatable="False" category="Variant Tags" />
</Component>
<Effect>
<Property name="name" formalName="Name" type="String" default="Effect" hidden="False" />
@@ -432,13 +442,17 @@
<Property name="name" formalName="Name" description="Object name" type="String" default="RenderPlugin" hidden="True" />
</RenderPlugin>
<Scene>
- <Property name="name" formalName="Name" type="String" default="Scene" hidden="True" />
- <Property name="eyeball" formalName="Visible" description="Item visibility" type="Boolean" default="True" hidden="True" />
- <Property name="bgcolorenable" formalName="Use Background" description="Clear the contents to a solid color\nbefore each frame?" type="Boolean" default="True" />
- <Property name="backgroundcolor" formalName="Background Color" description="Color to use for the background" type="Color" animatable="False" />
+ <!-- Background -->
+ <Property name="bgcolorenable" formalName="Use Background" category="Background" type="Boolean" default="True" description="Clear the contents to a solid color\nbefore each frame?" />
+ <Property name="backgroundcolor" formalName="Background Color" category="Background" type="Color" animatable="False" description="Color to use for the background" />
+
<Event name="onPressureDown" category="Gesture" />
- <Event name="onPressureUp" category="Gesture" />
- <Event name="onTap" category="Gesture" />
+ <Event name="onPressureUp" category="Gesture" />
+ <Event name="onTap" category="Gesture" />
+
+ <!-- Hidden and commented out props -->
+ <Property name="name" formalName="Name" category="Basic Properties" type="String" default="Scene" hidden="True" />
+ <Property name="eyeball" formalName="Visible" category="Basic Properties" type="Boolean" default="True" hidden="True" description="Item visibility" />
<!--
<Event name="onDoubleTap" category="Gesture" />
<Event name="onSingleTap" category="Gesture" />
@@ -459,11 +473,12 @@
-->
</Scene>
<Slide>
- <Property name="playmode" formalName="Play Mode" description="Action to take when reaching the end of\nall timebars on this slide" list="Stop at end:Looping:PingPong:Ping:Play Through To..." default="Stop at end" animatable="False" />
- <Property name="playthroughto" formalName="Play Through To" description="Slide to go to after this one" type="StringListOrInt" list="Next:Previous" default="Next" animatable="False">
+ <!-- Play Mode -->
+ <Property name="playmode" formalName="Play Mode" category="Play Mode" default="Stop at end" animatable="False" list="Stop at end:Looping:PingPong:Ping:Play Through To..." description="Action to take when reaching the end of\nall timebars on this slide" />
+ <Property name="playthroughto" formalName="Play Through To" category="Play Mode" default="Next" animatable="False" type="StringListOrInt" list="Next:Previous" description="Slide to go to after this one">
<ShowIfEqual property="playmode" value="Play Through To..."/>
</Property>
- <Property name="initialplaystate" formalName="Initial Play State" description="Do animations start when coming to\nthis slide?" list="Play:Pause" default="Play" animatable="False" />
+ <Property name="initialplaystate" formalName="Initial Play State" category="Play Mode" default="Play" animatable="False" list="Play:Pause" description="Do animations start when coming to\nthis slide?" />
</Slide>
<SlideOwner>
<Event name="onSlideEnter" category="Slide" description="Fired when the slide is changing" />