From 0ba76b77106d97a946c0ec83b16cbf57394bfffc Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Mon, 2 Nov 2015 18:40:44 +0000 Subject: [PATCH] Changes following the property & singal name changes --- builder/dali-builder.cpp | 2 +- demo/dali-table-view.cpp | 4 ++-- examples/blocks/blocks-example.cpp | 4 ++-- examples/builder/examples.cpp | 2 +- examples/buttons/buttons-example.cpp | 10 +++++----- examples/gradients/gradients-example.cpp | 26 +++++++++++++------------- examples/hello-world/hello-world-example.cpp | 2 +- examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp | 12 ++++++------ examples/magnifier/magnifier-example.cpp | 2 +- examples/model3d-view/model3d-view-example.cpp | 2 +- examples/new-window/new-window-example.cpp | 4 ++-- examples/popup/popup-example.cpp | 10 +++++----- examples/text-field/text-field-example.cpp | 2 +- examples/text-message-field/text-message-field-example.cpp | 6 +++--- examples/textured-mesh/textured-mesh-example.cpp | 6 +++--- resources/scripts/animated-buttons.json | 152 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------- resources/scripts/animated-colors.json | 250 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------- resources/scripts/animation.json | 38 +++++++++++++++++++------------------- resources/scripts/background-color.json | 26 +++++++++++++------------- resources/scripts/button.json | 38 +++++++++++++++++++------------------- resources/scripts/choreography.json | 200 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------- resources/scripts/contacts.json | 194 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------- resources/scripts/gallery.json | 198 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------- resources/scripts/hello-world.json | 2 +- resources/scripts/music-library.json | 184 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------- resources/scripts/popup.json | 284 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------- resources/scripts/shader-effect-ripple.json | 22 +++++++++++----------- resources/scripts/slider-test-style.json | 16 ++++++++-------- resources/scripts/slider.json | 136 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------- resources/scripts/super-blur-view.json | 30 +++++++++++++++--------------- resources/scripts/table-view.json | 64 ++++++++++++++++++++++++++++++++-------------------------------- resources/scripts/timing.json | 202 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------- resources/style/demo-theme.json | 30 +++++++++++++++--------------- resources/style/mobile/demo-theme.json | 50 +++++++++++++++++++++++++------------------------- 34 files changed, 1105 insertions(+), 1105 deletions(-) diff --git a/builder/dali-builder.cpp b/builder/dali-builder.cpp index d423d85..0a693a7 100644 --- a/builder/dali-builder.cpp +++ b/builder/dali-builder.cpp @@ -56,7 +56,7 @@ std::string JSON_BROKEN(" \ { \ 'type':'TextActor', \ 'size': [50,50,1], \ - 'parent-origin': 'CENTER', \ + 'parentOrigin': 'CENTER', \ 'text':'COULD NOT LOAD JSON FILE' \ } \ ] \ diff --git a/demo/dali-table-view.cpp b/demo/dali-table-view.cpp index 727140f..44eeea8 100644 --- a/demo/dali-table-view.cpp +++ b/demo/dali-table-view.cpp @@ -938,11 +938,11 @@ void DaliTableView::OnLogoTapped( Dali::Actor actor, const Dali::TapGesture& tap mVersionPopup = Dali::Toolkit::Popup::New(); Toolkit::TextLabel titleActor = Toolkit::TextLabel::New( "Version information" ); - titleActor.SetName( "title-actor" ); + titleActor.SetName( "titleActor" ); titleActor.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); Toolkit::TextLabel contentActor = Toolkit::TextLabel::New( stream.str() ); - contentActor.SetName( "content-actor" ); + contentActor.SetName( "contentActor" ); contentActor.SetProperty( Toolkit::TextLabel::Property::MULTI_LINE, true ); contentActor.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); contentActor.SetPadding( Padding( 0.0f, 0.0f, 20.0f, 0.0f ) ); diff --git a/examples/blocks/blocks-example.cpp b/examples/blocks/blocks-example.cpp index 0da125b..d61b86d 100644 --- a/examples/blocks/blocks-example.cpp +++ b/examples/blocks/blocks-example.cpp @@ -56,8 +56,8 @@ const Vector3 PADDLE_COLLISION_MARGIN(0.0f, 0.0f, 0.0f); ///< const Vector3 BRICK_COLLISION_MARGIN(0.0f, 0.0f, 0.0f); ///< Collision margin for ball-brick detection. const Vector3 INITIAL_BALL_DIRECTION(1.0f, 1.0f, 0.0f); ///< Initial ball direction. -const std::string WOBBLE_PROPERTY_NAME("wobble-property"); ///< Wobble property name. -const std::string COLLISION_PROPERTY_NAME("collision-property"); ///< Collision property name. +const std::string WOBBLE_PROPERTY_NAME("wobbleProperty"); ///< Wobble property name. +const std::string COLLISION_PROPERTY_NAME("collisionProperty"); ///< Collision property name. const Vector2 BRICK_SIZE(0.1f, 0.05f ); ///< Brick size relative to width of stage. const Vector2 BALL_SIZE( 0.05f, 0.05f ); ///< Ball size relative to width of stage. diff --git a/examples/builder/examples.cpp b/examples/builder/examples.cpp index f302d9f..2402e42 100644 --- a/examples/builder/examples.cpp +++ b/examples/builder/examples.cpp @@ -64,7 +64,7 @@ std::string JSON_BROKEN(" \ { \ 'type':'TextLabel', \ 'size': [50,50,1], \ - 'parent-origin': 'CENTER', \ + 'parentOrigin': 'CENTER', \ 'text':'COULD NOT LOAD JSON FILE' \ } \ ] \ diff --git a/examples/buttons/buttons-example.cpp b/examples/buttons/buttons-example.cpp index 842bfa3..11979db 100644 --- a/examples/buttons/buttons-example.cpp +++ b/examples/buttons/buttons-example.cpp @@ -206,7 +206,7 @@ class ButtonsController: public ConnectionTracker // Create select button mUpdateButton = Toolkit::PushButton::New(); mUpdateButton.SetLabelText( "Select" ); - mUpdateButton.SetName( "select-button" ); + mUpdateButton.SetName( "selectButton" ); mUpdateButton.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); mUpdateButton.ClickedSignal().Connect( this, &ButtonsController::OnButtonClicked ); @@ -268,7 +268,7 @@ class ButtonsController: public ConnectionTracker // First radio button { Toolkit::RadioButton radioButton = Dali::Toolkit::RadioButton::New( "Select enabled" ); - radioButton.SetName( "radio-select-enable" ); + radioButton.SetName( "radioSelectEnable" ); radioButton.SetParentOrigin( ParentOrigin::TOP_LEFT ); radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT ); radioButton.SetPosition( 0, 0 ); @@ -282,7 +282,7 @@ class ButtonsController: public ConnectionTracker // Second radio button { Toolkit::RadioButton radioButton = Dali::Toolkit::RadioButton::New( "Select disabled" ); - radioButton.SetName( "radio-select-disable" ); + radioButton.SetName( "radioSelectDisable" ); radioButton.SetParentOrigin( ParentOrigin::TOP_LEFT ); radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT ); radioButton.SetPosition( 0, DP(50) ); @@ -390,7 +390,7 @@ class ButtonsController: public ConnectionTracker bool EnableSelectButton( Toolkit::Button button ) { - if( button.GetName() == "radio-select-enable" && button.IsSelected() == true ) + if( button.GetName() == "radioSelectEnable" && button.IsSelected() == true ) { mUpdateButton.SetDisabled( false ); @@ -404,7 +404,7 @@ class ButtonsController: public ConnectionTracker mToggleButton.SetDisabled( false ); } - else if( button.GetName() == "radio-select-disable" && button.IsSelected() == true ) + else if( button.GetName() == "radioSelectDisable" && button.IsSelected() == true ) { mUpdateButton.SetDisabled( true ); diff --git a/examples/gradients/gradients-example.cpp b/examples/gradients/gradients-example.cpp index 6ea9b15..ca2b579 100644 --- a/examples/gradients/gradients-example.cpp +++ b/examples/gradients/gradients-example.cpp @@ -79,21 +79,21 @@ public: // ---- Gradient for background - mGradientMap.Insert("renderer-type", "gradient-renderer"); + mGradientMap.Insert("rendererType", "gradientRenderer"); Property::Array stopOffsets; stopOffsets.PushBack( 0.0f ); stopOffsets.PushBack( 0.3f ); stopOffsets.PushBack( 0.6f ); stopOffsets.PushBack( 0.8f ); stopOffsets.PushBack( 1.f ); - mGradientMap.Insert("gradient-stop-offset", stopOffsets); + mGradientMap.Insert("gradientStopOffset", stopOffsets); Property::Array stopColors; stopColors.PushBack( Vector4( 129.f, 198.f, 193.f, 255.f )/255.f ); stopColors.PushBack( Vector4( 196.f, 198.f, 71.f, 122.f )/255.f ); stopColors.PushBack( Vector4( 214.f, 37.f, 139.f, 191.f )/255.f ); stopColors.PushBack( Vector4( 129.f, 198.f, 193.f, 150.f )/255.f ); stopColors.PushBack( Color::YELLOW ); - mGradientMap.Insert("gradient-stop-color", stopColors); + mGradientMap.Insert("gradientStopColor", stopColors); OnChangeIconClicked( changeButton ); } @@ -106,30 +106,30 @@ public: { case 0: // linear gradient with units as objectBoundingBox { - gradientMap.Insert("gradient-start-position", Vector2( 0.5f, 0.5f )); - gradientMap.Insert("gradient-end-position", Vector2( -0.5f, -0.5f )); + gradientMap.Insert("gradientStartPosition", Vector2( 0.5f, 0.5f )); + gradientMap.Insert("gradientEndPosition", Vector2( -0.5f, -0.5f )); break; } case 1: // linear gradient with units as userSpaceOnUse { Vector2 halfStageSize = Stage::GetCurrent().GetSize()*0.5f; - gradientMap.Insert("gradient-start-position", halfStageSize); - gradientMap.Insert("gradient-end-position", -halfStageSize ); - gradientMap.Insert("gradient-units", "user-space"); + gradientMap.Insert("gradientStartPosition", halfStageSize); + gradientMap.Insert("gradientEndPosition", -halfStageSize ); + gradientMap.Insert("gradientUnits", "userSpace"); break; } case 2: // radial gradient with units as objectBoundingBox { - gradientMap.Insert("gradient-center", Vector2(0.5f, 0.5f)); - gradientMap.Insert("gradient-radius", 1.414f); + gradientMap.Insert("gradientCenter", Vector2(0.5f, 0.5f)); + gradientMap.Insert("gradientRadius", 1.414f); break; } default: // radial gradient with units as userSpaceOnUse { Vector2 stageSize = Stage::GetCurrent().GetSize(); - gradientMap.Insert("gradient-center", stageSize*0.5f); - gradientMap.Insert("gradient-radius", stageSize.Length()); - gradientMap.Insert("gradient-units", "user-space"); + gradientMap.Insert("gradientCenter", stageSize*0.5f); + gradientMap.Insert("gradientRadius", stageSize.Length()); + gradientMap.Insert("gradientUnits", "userSpace"); break; } } diff --git a/examples/hello-world/hello-world-example.cpp b/examples/hello-world/hello-world-example.cpp index 3a944fa..f316b2c 100644 --- a/examples/hello-world/hello-world-example.cpp +++ b/examples/hello-world/hello-world-example.cpp @@ -47,7 +47,7 @@ public: TextLabel textLabel = TextLabel::New( "Hello World" ); textLabel.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - textLabel.SetName( "hello-world-label" ); + textLabel.SetName( "helloWorldLabel" ); stage.Add( textLabel ); // Respond to a click anywhere on the stage diff --git a/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp b/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp index eb70bc8..4fcd0a1 100644 --- a/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp +++ b/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp @@ -171,12 +171,12 @@ public: // Background image: Dali::Property::Map backgroundImage; - backgroundImage.Insert( "renderer-type", "image-renderer" ); - backgroundImage.Insert( "image-url", BACKGROUND_IMAGE ); - backgroundImage.Insert( "image-desired-width", stage.GetSize().width ); - backgroundImage.Insert( "image-desired-height", stage.GetSize().height ); - backgroundImage.Insert( "image-fitting-mode", "scale-to-fill" ); - backgroundImage.Insert( "image-sampling-mode", "box-then-nearest" ); + backgroundImage.Insert( "rendererType", "imageRenderer" ); + backgroundImage.Insert( "imageUrl", BACKGROUND_IMAGE ); + backgroundImage.Insert( "imageDesiredWidth", stage.GetSize().width ); + backgroundImage.Insert( "imageDesiredHeight", stage.GetSize().height ); + backgroundImage.Insert( "imageFittingMode", "scaleToFill" ); + backgroundImage.Insert( "imageSamplingMode", "boxThenNearest" ); Toolkit::ImageView background = Toolkit::ImageView::New(); background.SetProperty( Toolkit::ImageView::Property::IMAGE, backgroundImage ); diff --git a/examples/magnifier/magnifier-example.cpp b/examples/magnifier/magnifier-example.cpp index 8f0945d..f781d70 100644 --- a/examples/magnifier/magnifier-example.cpp +++ b/examples/magnifier/magnifier-example.cpp @@ -245,7 +245,7 @@ public: mBouncingMagnifier.SetProperty( Toolkit::Magnifier::Property::MAGNIFICATION_FACTOR, MAGNIFICATION_FACTOR ); overlay.Add( mBouncingMagnifier ); - mAnimationTimeProperty = mBouncingMagnifier.RegisterProperty("animation-time", 0.0f); + mAnimationTimeProperty = mBouncingMagnifier.RegisterProperty("animationTime", 0.0f); ContinueAnimation(); // Apply constraint to animate the position of the magnifier. diff --git a/examples/model3d-view/model3d-view-example.cpp b/examples/model3d-view/model3d-view-example.cpp index ee4112c..fc056b5 100644 --- a/examples/model3d-view/model3d-view-example.cpp +++ b/examples/model3d-view/model3d-view-example.cpp @@ -95,7 +95,7 @@ public: mModel3dView = Model3dView::New( MODEL_FILE[0], MATERIAL_FILE[0], IMAGE_PATH ); mModel3dView.SetParentOrigin( ParentOrigin::CENTER ); mModel3dView.SetAnchorPoint( AnchorPoint::CENTER ); - mModel3dView.SetName( "model3d-view-control" ); + mModel3dView.SetName( "model3dViewControl" ); mModel3dView.SetResizePolicy(ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS); mModel3dView.SetSize(screenSize); diff --git a/examples/new-window/new-window-example.cpp b/examples/new-window/new-window-example.cpp index c553b6c..f494b9b 100644 --- a/examples/new-window/new-window-example.cpp +++ b/examples/new-window/new-window-example.cpp @@ -211,7 +211,7 @@ void NewWindowController::Create( Application& app ) Image image = ResourceImage::New(LOGO_IMAGE); ImageView imageView = ImageView::New(image); - imageView.SetName("dali-logo"); + imageView.SetName("daliLogo"); imageView.SetParentOrigin(ParentOrigin::CENTER); imageView.SetAnchorPoint(AnchorPoint::BOTTOM_CENTER); logoLayoutActor.Add(imageView); @@ -477,7 +477,7 @@ Dali::Property::Map NewWindowController::CreateColorModifierer() Property::Map map; Property::Map customShader; - customShader[ "fragment-shader" ] = fragmentShader; + customShader[ "fragmentShader" ] = fragmentShader; map[ "shader" ] = customShader; return map; diff --git a/examples/popup/popup-example.cpp b/examples/popup/popup-example.cpp index ea2e89a..9d83606 100644 --- a/examples/popup/popup-example.cpp +++ b/examples/popup/popup-example.cpp @@ -56,8 +56,8 @@ const char* const POPUP_BUTTON_FIXED_SIZE_ID = "POPUP_BUTTON_FIXED_SIZE_ID"; const char* const POPUP_BUTTON_COMPLEX_ID = "POPUP_BUTTON_COMPLEX"; // Names to give Popup PushButton controls. -const char* const POPUP_CONTROL_OK_NAME = "control-ok"; -const char* const POPUP_CONTROL_CANCEL_NAME = "control-cancel"; +const char* const POPUP_CONTROL_OK_NAME = "controlOk"; +const char* const POPUP_CONTROL_CANCEL_NAME = "controlCancel"; const char* const CONTENT_TEXT = "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."; const char* const IMAGE1 = DALI_IMAGE_DIR "gallery-medium-5.jpg"; @@ -352,7 +352,7 @@ public: { // Start with a control area image. Toolkit::ImageView footer = Toolkit::ImageView::New( DEFAULT_CONTROL_AREA_IMAGE_PATH ); - footer.SetName( "control-area-image" ); + footer.SetName( "controlAreaImage" ); // Set up the container's layout. footer.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); footer.SetResizePolicy( ResizePolicy::FIXED, Dimension::HEIGHT ); @@ -407,7 +407,7 @@ public: Actor CreateTitle( std::string title ) { Toolkit::TextLabel titleActor = Toolkit::TextLabel::New( title ); - titleActor.SetName( "title-actor" ); + titleActor.SetName( "titleActor" ); titleActor.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Color::WHITE ); titleActor.SetProperty( Toolkit::TextLabel::Property::MULTI_LINE, true ); titleActor.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); @@ -471,7 +471,7 @@ public: else if( button.GetName() == POPUP_BUTTON_TOAST_ID ) { // Create a toast popup via the type registry (as it is a named-type). - TypeInfo typeInfo = TypeRegistry::Get().GetTypeInfo( "popup-toast" ); + TypeInfo typeInfo = TypeRegistry::Get().GetTypeInfo( "popupToast" ); if( typeInfo ) { BaseHandle baseHandle = typeInfo.CreateInstance(); diff --git a/examples/text-field/text-field-example.cpp b/examples/text-field/text-field-example.cpp index 9b4a5f4..0f12e4d 100644 --- a/examples/text-field/text-field-example.cpp +++ b/examples/text-field/text-field-example.cpp @@ -115,7 +115,7 @@ public: TextField CreateTextField( const Vector2& stageSize, const std::string& text ) { TextField field = TextField::New(); - field.SetName("text-field"); + field.SetName("textField"); field.SetAnchorPoint( AnchorPoint::TOP_LEFT ); field.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); field.SetResizePolicy( ResizePolicy::DIMENSION_DEPENDENCY, Dimension::HEIGHT ); diff --git a/examples/text-message-field/text-message-field-example.cpp b/examples/text-message-field/text-message-field-example.cpp index 0189334..4e337b5 100644 --- a/examples/text-message-field/text-message-field-example.cpp +++ b/examples/text-message-field/text-message-field-example.cpp @@ -89,9 +89,9 @@ public: Control photoBoxA = Control::New(); Dali::Property::Map border; - border.Insert( "renderer-type", "border-renderer" ); - border.Insert( "border-color", Color::WHITE ); - border.Insert( "border-size", 1.f ); + border.Insert( "rendererType", "borderRenderer" ); + border.Insert( "borderColor", Color::WHITE ); + border.Insert( "borderSize", 1.f ); photoBoxA.SetProperty( Control::Property::BACKGROUND, border ); photoBoxA.SetName("photoBoxA"); diff --git a/examples/textured-mesh/textured-mesh-example.cpp b/examples/textured-mesh/textured-mesh-example.cpp index 2271dda..3af6740 100644 --- a/examples/textured-mesh/textured-mesh-example.cpp +++ b/examples/textured-mesh/textured-mesh-example.cpp @@ -175,10 +175,10 @@ public: mMeshActor2.AddRenderer( mRenderer2 ); mMeshActor2.SetSize(400, 400); - mMeshActor2.RegisterProperty( "a-n-other-property", Color::GREEN ); + mMeshActor2.RegisterProperty( "anotherProperty", Color::GREEN ); - mRenderer2.RegisterProperty( "a-n-other-property", Vector3::ZERO ); - mRenderer2.RegisterProperty( "a-coefficient", 0.008f ); + mRenderer2.RegisterProperty( "anotherProperty", Vector3::ZERO ); + mRenderer2.RegisterProperty( "aCoefficient", 0.008f ); Property::Index fadeColorIndex2 = mRenderer2.RegisterProperty( "uFadeColor", Color::BLUE ); mRenderer2.SetDepthIndex(0); diff --git a/resources/scripts/animated-buttons.json b/resources/scripts/animated-buttons.json index 8bf6055..f7e2a8e 100644 --- a/resources/scripts/animated-buttons.json +++ b/resources/scripts/animated-buttons.json @@ -3,7 +3,7 @@ { "type": "ImageActor", "name": "On", - "relayout-enabled": false, + "relayoutEnabled": false, "position": [ 374, 215, @@ -25,8 +25,8 @@ "filename": "{DALI_IMAGE_DIR}spot_button_on.png", "width": 144, "height": 144, - "load-policy": "IMMEDIATE", - "release-policy": "NEVER" + "loadPolicy": "IMMEDIATE", + "releasePolicy": "NEVER" }, "path": "spot_button_on.png", "actors": [] @@ -34,7 +34,7 @@ { "type": "ImageActor", "name": "Off", - "relayout-enabled": false, + "relayoutEnabled": false, "position": [ 129, 215, @@ -56,8 +56,8 @@ "filename": "{DALI_IMAGE_DIR}spot_button_off.png", "width": 144, "height": 144, - "load-policy": "IMMEDIATE", - "release-policy": "NEVER" + "loadPolicy": "IMMEDIATE", + "releasePolicy": "NEVER" }, "path": "spot_button_off.png", "actors": [] @@ -65,7 +65,7 @@ { "type": "ImageActor", "name": "Right", - "relayout-enabled": false, + "relayoutEnabled": false, "position": [ 418.5, 214.5, @@ -88,8 +88,8 @@ "filename": "{DALI_IMAGE_DIR}curve-right.png", "width": 85, "height": 161, - "load-policy": "IMMEDIATE", - "release-policy": "NEVER" + "loadPolicy": "IMMEDIATE", + "releasePolicy": "NEVER" }, "path": "curve-right.png", "actors": [] @@ -97,7 +97,7 @@ { "type": "ImageActor", "name": "Left", - "relayout-enabled": false, + "relayoutEnabled": false, "position": [ 331, 214.5, @@ -120,8 +120,8 @@ "filename": "{DALI_IMAGE_DIR}curve-left.png", "width": 87, "height": 161, - "load-policy": "IMMEDIATE", - "release-policy": "NEVER" + "loadPolicy": "IMMEDIATE", + "releasePolicy": "NEVER" }, "path": "curve-left.png", "actors": [] @@ -129,13 +129,13 @@ { "type": "ImageActor", "name": "Middle", - "relayout-enabled": false, + "relayoutEnabled": false, "position": [ 375.5, 214.5, 0 ], - "anchor-point": [ + "anchorPoint": [ 0, 0.5, 0.5 @@ -156,8 +156,8 @@ "filename": "{DALI_IMAGE_DIR}curve-middle.png", "width": 13, "height": 161, - "load-policy": "IMMEDIATE", - "release-policy": "NEVER" + "loadPolicy": "IMMEDIATE", + "releasePolicy": "NEVER" }, "path": "curve-middle.png", "actors": [] @@ -165,7 +165,7 @@ { "type": "ImageActor", "name": "Jelly", - "relayout-enabled": false, + "relayoutEnabled": false, "position": [ 374, 215, @@ -187,8 +187,8 @@ "filename": "{DALI_IMAGE_DIR}spot_jelly_on.png", "width": 144, "height": 144, - "load-policy": "IMMEDIATE", - "release-policy": "NEVER" + "loadPolicy": "IMMEDIATE", + "releasePolicy": "NEVER" }, "path": "spot_jelly_on.png", "actors": [] @@ -196,7 +196,7 @@ { "type": "Control", "name": "Left Crop", - "relayout-enabled": false, + "relayoutEnabled": false, "position": [ 144.5, 218.5, @@ -220,7 +220,7 @@ { "type": "Control", "name": "Right Crop", - "relayout-enabled": false, + "relayoutEnabled": false, "position": [ 629.5, 218.5, @@ -244,7 +244,7 @@ { "type": "ImageActor", "name": "JellyOff", - "relayout-enabled": false, + "relayoutEnabled": false, "position": [ 121, -117, @@ -266,8 +266,8 @@ "filename": "{DALI_IMAGE_DIR}spot_jelly_off.png", "width": 144, "height": 144, - "load-policy": "IMMEDIATE", - "release-policy": "NEVER" + "loadPolicy": "IMMEDIATE", + "releasePolicy": "NEVER" }, "path": "spot_jelly_off.png", "actors": [] @@ -275,7 +275,7 @@ { "type": "Control", "name": "Control On", - "relayout-enabled": false, + "relayoutEnabled": false, "position": [ 371.26116838487997, 217.33333333333331, @@ -310,7 +310,7 @@ { "type": "Control", "name": "Control Off", - "relayout-enabled": false, + "relayoutEnabled": false, "position": [ 123.5, -117, @@ -349,8 +349,8 @@ 214.5, 0 ], - "alpha-function": "EASE_OUT", - "time-period": { + "alphaFunction": "EASE_OUT", + "timePeriod": { "delay": 3.106, "duration": 1.465 }, @@ -364,8 +364,8 @@ 214.5, 0 ], - "alpha-function": "EASE_OUT", - "time-period": { + "alphaFunction": "EASE_OUT", + "timePeriod": { "delay": 3.106, "duration": 1.465 }, @@ -379,8 +379,8 @@ 161, 1 ], - "alpha-function": "EASE_OUT", - "time-period": { + "alphaFunction": "EASE_OUT", + "timePeriod": { "delay": 0, "duration": 1.27 }, @@ -394,8 +394,8 @@ 161, 1 ], - "alpha-function": "EASE_OUT", - "time-period": { + "alphaFunction": "EASE_OUT", + "timePeriod": { "delay": 3.127, "duration": 1.44 }, @@ -409,8 +409,8 @@ 215, 0 ], - "alpha-function": "EASE_OUT", - "time-period": { + "alphaFunction": "EASE_OUT", + "timePeriod": { "delay": 1.486, "duration": 1.29 }, @@ -424,8 +424,8 @@ 218.5, 0.5 ], - "alpha-function": "EASE_OUT", - "time-period": { + "alphaFunction": "EASE_OUT", + "timePeriod": { "delay": 3.106, "duration": 1.47 }, @@ -439,8 +439,8 @@ 214.5, 0 ], - "alpha-function": "EASE_OUT", - "time-period": { + "alphaFunction": "EASE_OUT", + "timePeriod": { "delay": 0, "duration": 1.27 }, @@ -454,8 +454,8 @@ 218.5, 0.5 ], - "alpha-function": "EASE_OUT", - "time-period": { + "alphaFunction": "EASE_OUT", + "timePeriod": { "delay": 0, "duration": 1.276 }, @@ -469,8 +469,8 @@ 217.33333333333331, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 2.765, "duration": 0.001 }, @@ -484,8 +484,8 @@ -117, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0, "duration": 0.001 }, @@ -499,8 +499,8 @@ 215, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 2.765, "duration": 0.001 }, @@ -514,8 +514,8 @@ -117, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 2.765, "duration": 0.001 }, @@ -529,8 +529,8 @@ -117, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0, "duration": 0.001 }, @@ -549,8 +549,8 @@ 214.5, 0 ], - "alpha-function": "EASE_OUT", - "time-period": { + "alphaFunction": "EASE_OUT", + "timePeriod": { "delay": 0, "duration": 1.27 }, @@ -564,8 +564,8 @@ 214.5, 0 ], - "alpha-function": "EASE_OUT", - "time-period": { + "alphaFunction": "EASE_OUT", + "timePeriod": { "delay": 0, "duration": 1.27 }, @@ -579,8 +579,8 @@ 161, 1 ], - "alpha-function": "EASE_OUT", - "time-period": { + "alphaFunction": "EASE_OUT", + "timePeriod": { "delay": 0, "duration": 1.27 }, @@ -594,8 +594,8 @@ 161, 1 ], - "alpha-function": "EASE_OUT", - "time-period": { + "alphaFunction": "EASE_OUT", + "timePeriod": { "delay": 3.127, "duration": 1.44 }, @@ -609,8 +609,8 @@ 215, 0 ], - "alpha-function": "EASE_OUT", - "time-period": { + "alphaFunction": "EASE_OUT", + "timePeriod": { "delay": 1.486, "duration": 1.29 }, @@ -624,8 +624,8 @@ 219, 0 ], - "alpha-function": "EASE_OUT", - "time-period": { + "alphaFunction": "EASE_OUT", + "timePeriod": { "delay": 0, "duration": 1.276 }, @@ -639,8 +639,8 @@ 214.5, 0.5 ], - "alpha-function": "EASE_OUT", - "time-period": { + "alphaFunction": "EASE_OUT", + "timePeriod": { "delay": 3.106, "duration": 1.465 }, @@ -654,8 +654,8 @@ 218.5, 0.5 ], - "alpha-function": "EASE_OUT", - "time-period": { + "alphaFunction": "EASE_OUT", + "timePeriod": { "delay": 3.106, "duration": 1.47 }, @@ -669,8 +669,8 @@ -131, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0, "duration": 0.001 }, @@ -684,8 +684,8 @@ 215, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 2.765, "duration": 0.001 }, @@ -699,8 +699,8 @@ -117, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 2.765, "duration": 0.001 }, @@ -714,8 +714,8 @@ 215, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 2.765, "duration": 0.001 }, diff --git a/resources/scripts/animated-colors.json b/resources/scripts/animated-colors.json index 517c5af..53df15b 100644 --- a/resources/scripts/animated-colors.json +++ b/resources/scripts/animated-colors.json @@ -27,13 +27,13 @@ 0, 0 ], - "inherit-position": true, - "parent-origin": [ + "inheritPosition": true, + "parentOrigin": [ 0, 0.5, 0.5 ], - "anchor-point": [ + "anchorPoint": [ 1, 0.5, 0.5 @@ -63,13 +63,13 @@ 0, 0 ], - "inherit-position": true, - "parent-origin": [ + "inheritPosition": true, + "parentOrigin": [ 0, 0.5, 0.5 ], - "anchor-point": [ + "anchorPoint": [ 1, 0.5, 0.5 @@ -99,13 +99,13 @@ 0, 0 ], - "inherit-position": true, - "parent-origin": [ + "inheritPosition": true, + "parentOrigin": [ 1, 0.5, 0.5 ], - "anchor-point": [ + "anchorPoint": [ 0, 0.5, 0.5 @@ -131,13 +131,13 @@ 0, 0 ], - "inherit-position": true, - "parent-origin": [ + "inheritPosition": true, + "parentOrigin": [ 1, 0.5, 0.5 ], - "anchor-point": [ + "anchorPoint": [ 0, 0.5, 0.5 @@ -167,13 +167,13 @@ 0, 0 ], - "inherit-position": true, - "parent-origin": [ + "inheritPosition": true, + "parentOrigin": [ 0, 0.5, 0.5 ], - "anchor-point": [ + "anchorPoint": [ 1, 0.5, 0.5 @@ -203,13 +203,13 @@ 0, 0 ], - "inherit-position": true, - "parent-origin": [ + "inheritPosition": true, + "parentOrigin": [ 1, 0.5, 0.5 ], - "anchor-point": [ + "anchorPoint": [ 0, 0.5, 0.5 @@ -235,13 +235,13 @@ 0, 0 ], - "inherit-position": true, - "parent-origin": [ + "inheritPosition": true, + "parentOrigin": [ 1, 0.5, 0.5 ], - "anchor-point": [ + "anchorPoint": [ 0, 0.5, 0.5 @@ -271,13 +271,13 @@ 0, 0 ], - "inherit-position": true, - "parent-origin": [ + "inheritPosition": true, + "parentOrigin": [ 0, 0.5, 0.5 ], - "anchor-point": [ + "anchorPoint": [ 1, 0.5, 0.5 @@ -307,13 +307,13 @@ 0, 0 ], - "inherit-position": true, - "parent-origin": [ + "inheritPosition": true, + "parentOrigin": [ 1, 0.5, 0.5 ], - "anchor-point": [ + "anchorPoint": [ 0, 0.5, 0.5 @@ -339,13 +339,13 @@ 0, 0 ], - "inherit-position": true, - "parent-origin": [ + "inheritPosition": true, + "parentOrigin": [ 1, 0.5, 0.5 ], - "anchor-point": [ + "anchorPoint": [ 0, 0.5, 0.5 @@ -371,13 +371,13 @@ 0, 0 ], - "inherit-position": true, - "parent-origin": [ + "inheritPosition": true, + "parentOrigin": [ 0.5, 1, 0.5 ], - "anchor-point": [ + "anchorPoint": [ 0.5, 0, 0.5 @@ -403,13 +403,13 @@ 0, 0 ], - "inherit-position": true, - "parent-origin": [ + "inheritPosition": true, + "parentOrigin": [ 0.5, 1, 0.5 ], - "anchor-point": [ + "anchorPoint": [ 0.5, 0, 0.5 @@ -435,13 +435,13 @@ 0, 0 ], - "inherit-position": true, - "parent-origin": [ + "inheritPosition": true, + "parentOrigin": [ 0.5, 1, 0.5 ], - "anchor-point": [ + "anchorPoint": [ 0.5, 0, 0.5 @@ -471,13 +471,13 @@ 0, 0 ], - "inherit-position": true, - "parent-origin": [ + "inheritPosition": true, + "parentOrigin": [ 1, 0.5, 0.5 ], - "anchor-point": [ + "anchorPoint": [ 0, 0.5, 0.5 @@ -503,13 +503,13 @@ 0, 0 ], - "inherit-position": true, - "parent-origin": [ + "inheritPosition": true, + "parentOrigin": [ 1, 0.5, 0.5 ], - "anchor-point": [ + "anchorPoint": [ 0, 0.5, 0.5 @@ -542,13 +542,13 @@ 0, 0 ], - "inherit-position": true, - "parent-origin": [ + "inheritPosition": true, + "parentOrigin": [ 1, 0.5, 0.5 ], - "anchor-point": [ + "anchorPoint": [ 0, 0.5, 0.5 @@ -574,13 +574,13 @@ 0, 0 ], - "inherit-position": true, - "parent-origin": [ + "inheritPosition": true, + "parentOrigin": [ 1, 0.5, 0.5 ], - "anchor-point": [ + "anchorPoint": [ 0, 0.5, 0.5 @@ -607,13 +607,13 @@ 0, 0 ], - "inherit-position": true, - "parent-origin": [ + "inheritPosition": true, + "parentOrigin": [ 0, 0.5, 0.5 ], - "anchor-point": [ + "anchorPoint": [ 1, 0.5, 0.5 @@ -646,13 +646,13 @@ 0, 0 ], - "inherit-position": true, - "parent-origin": [ + "inheritPosition": true, + "parentOrigin": [ 1, 0.5, 0.5 ], - "anchor-point": [ + "anchorPoint": [ 0, 0.5, 0.5 @@ -678,13 +678,13 @@ 0, 0 ], - "inherit-position": true, - "parent-origin": [ + "inheritPosition": true, + "parentOrigin": [ 1, 0.5, 0.5 ], - "anchor-point": [ + "anchorPoint": [ 0, 0.5, 0.5 @@ -711,13 +711,13 @@ 0, 0 ], - "inherit-position": true, - "parent-origin": [ + "inheritPosition": true, + "parentOrigin": [ 0, 0.5, 0.5 ], - "anchor-point": [ + "anchorPoint": [ 1, 0.5, 0.5 @@ -743,13 +743,13 @@ 0, 0 ], - "inherit-position": true, - "parent-origin": [ + "inheritPosition": true, + "parentOrigin": [ 0.5, 0, 0.5 ], - "anchor-point": [ + "anchorPoint": [ 0.5, 1, 0.5 @@ -775,13 +775,13 @@ 0, 0 ], - "inherit-position": true, - "parent-origin": [ + "inheritPosition": true, + "parentOrigin": [ 0.5, 0, 0.5 ], - "anchor-point": [ + "anchorPoint": [ 0.5, 1, 0.5 @@ -803,10 +803,10 @@ { "type": "TextLabel", "name": "text", - "parent-origin": "CENTER", - "anchor-point": "CENTER", + "parentOrigin": "CENTER", + "anchorPoint": "CENTER", "text": "START", - "point-size": 20, + "pointSize": 20, "signals": [ { "name": "tapped", @@ -827,13 +827,13 @@ 0, 0 ], - "inherit-position": true, - "parent-origin": [ + "inheritPosition": true, + "parentOrigin": [ 0.5, 0.5, 0.5 ], - "anchor-point": [ + "anchorPoint": [ 1, 1, 0.5 @@ -865,8 +865,8 @@ 0, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0, "duration": 0.2 }, @@ -886,8 +886,8 @@ 0.32941176470588235, 1 ], - "alpha-function": "SIN", - "time-period": { + "alphaFunction": "SIN", + "timePeriod": { "delay": 0, "duration": 2 }, @@ -902,8 +902,8 @@ 0.9098039215686274, 1 ], - "alpha-function": "SIN", - "time-period": { + "alphaFunction": "SIN", + "timePeriod": { "delay": 0, "duration": 2 }, @@ -918,8 +918,8 @@ 0.4235294117647059, 1 ], - "alpha-function": "SIN", - "time-period": { + "alphaFunction": "SIN", + "timePeriod": { "delay": 0, "duration": 2 }, @@ -934,8 +934,8 @@ 0.027450980392156862, 1 ], - "alpha-function": "SIN", - "time-period": { + "alphaFunction": "SIN", + "timePeriod": { "delay": 0, "duration": 2 }, @@ -950,8 +950,8 @@ 0.8627450980392157, 1 ], - "alpha-function": "SIN", - "time-period": { + "alphaFunction": "SIN", + "timePeriod": { "delay": 0, "duration": 2 }, @@ -966,8 +966,8 @@ 0.1803921568627451, 1 ], - "alpha-function": "SIN", - "time-period": { + "alphaFunction": "SIN", + "timePeriod": { "delay": 0, "duration": 2 }, @@ -982,8 +982,8 @@ 0.5333333333333333, 1 ], - "alpha-function": "SIN", - "time-period": { + "alphaFunction": "SIN", + "timePeriod": { "delay": 0, "duration": 2 }, @@ -998,8 +998,8 @@ 0, 1 ], - "alpha-function": "SIN", - "time-period": { + "alphaFunction": "SIN", + "timePeriod": { "delay": 0, "duration": 2 }, @@ -1014,8 +1014,8 @@ 1, 1 ], - "alpha-function": "SIN", - "time-period": { + "alphaFunction": "SIN", + "timePeriod": { "delay": 0, "duration": 2 }, @@ -1030,8 +1030,8 @@ 0.06666666666666667, 1 ], - "alpha-function": "SIN", - "time-period": { + "alphaFunction": "SIN", + "timePeriod": { "delay": 0, "duration": 2 }, @@ -1046,8 +1046,8 @@ 0, 1 ], - "alpha-function": "SIN", - "time-period": { + "alphaFunction": "SIN", + "timePeriod": { "delay": 0, "duration": 2 }, @@ -1062,8 +1062,8 @@ 0.788235294117647, 1 ], - "alpha-function": "SIN", - "time-period": { + "alphaFunction": "SIN", + "timePeriod": { "delay": 0, "duration": 2 }, @@ -1078,8 +1078,8 @@ 0.7294117647058823, 1 ], - "alpha-function": "SIN", - "time-period": { + "alphaFunction": "SIN", + "timePeriod": { "delay": 0.001, "duration": 2 }, @@ -1094,8 +1094,8 @@ 1, 1 ], - "alpha-function": "SIN", - "time-period": { + "alphaFunction": "SIN", + "timePeriod": { "delay": 0, "duration": 2 }, @@ -1110,8 +1110,8 @@ 0, 1 ], - "alpha-function": "SIN", - "time-period": { + "alphaFunction": "SIN", + "timePeriod": { "delay": 0, "duration": 2 }, @@ -1126,8 +1126,8 @@ 0.5607843137254902, 1 ], - "alpha-function": "SIN", - "time-period": { + "alphaFunction": "SIN", + "timePeriod": { "delay": 0, "duration": 2 }, @@ -1142,8 +1142,8 @@ 1, 1 ], - "alpha-function": "SIN", - "time-period": { + "alphaFunction": "SIN", + "timePeriod": { "delay": 0, "duration": 2 }, @@ -1158,8 +1158,8 @@ 0, 1 ], - "alpha-function": "SIN", - "time-period": { + "alphaFunction": "SIN", + "timePeriod": { "delay": 0.001, "duration": 2 }, @@ -1174,8 +1174,8 @@ 0.24313725490196078, 1 ], - "alpha-function": "SIN", - "time-period": { + "alphaFunction": "SIN", + "timePeriod": { "delay": 0, "duration": 2 }, @@ -1190,8 +1190,8 @@ 0.43137254901960786, 1 ], - "alpha-function": "SIN", - "time-period": { + "alphaFunction": "SIN", + "timePeriod": { "delay": 0, "duration": 2 }, @@ -1206,8 +1206,8 @@ 0, 1 ], - "alpha-function": "SIN", - "time-period": { + "alphaFunction": "SIN", + "timePeriod": { "delay": 0, "duration": 2 }, @@ -1222,8 +1222,8 @@ 1, 1 ], - "alpha-function": "SIN", - "time-period": { + "alphaFunction": "SIN", + "timePeriod": { "delay": 0, "duration": 2 }, @@ -1238,8 +1238,8 @@ 0.6784313725490196, 1 ], - "alpha-function": "SIN", - "time-period": { + "alphaFunction": "SIN", + "timePeriod": { "delay": 0, "duration": 2 }, @@ -1254,8 +1254,8 @@ 0.4196078431372549, 1 ], - "alpha-function": "SIN", - "time-period": { + "alphaFunction": "SIN", + "timePeriod": { "delay": 0, "duration": 2 }, diff --git a/resources/scripts/animation.json b/resources/scripts/animation.json index 0383037..624d285 100644 --- a/resources/scripts/animation.json +++ b/resources/scripts/animation.json @@ -17,11 +17,11 @@ { // library of styles "styles": { - "red-theme": { + "redTheme": { "color": [1, 0, 0, 1] }, - "basic-text": { - "parent-origin": "CENTER" + "basicText": { + "parentOrigin": "CENTER" } }, "paths": @@ -40,8 +40,8 @@ "actor": "greeting", // referenced actors must exist on stage "property": "position", "value": [300, 300, -1000], - "alpha-function": "EASE_IN_OUT", - "time-period": { + "alphaFunction": "EASE_IN_OUT", + "timePeriod": { "delay": 0, "duration": 3 } @@ -49,7 +49,7 @@ "actor": "greeting", // referenced actors must exist on stage "property": "scale", "value": [5, 5, 1], - "time-period": { + "timePeriod": { "delay": 2, "duration": 3 } @@ -61,21 +61,21 @@ "actor": "image", // referenced actors must exist on stage "property": "orientation", "value": [0, 0, -45], - "alpha-function": "EASE_IN_OUT", - "time-period": { + "alphaFunction": "EASE_IN_OUT", + "timePeriod": { "delay": 0, "duration": 3 } }] }, - "path-animation": { + "pathAnimation": { "duration": 3.0, "properties": [{ "actor": "greeting2", // referenced actors must exist on stage "path":"path0", "forward":[1,0,0], - "alpha-function": "EASE_IN_OUT", - "time-period": { + "alphaFunction": "EASE_IN_OUT", + "timePeriod": { "delay": 0, "duration": 3 } @@ -87,7 +87,7 @@ "name": "greeting", "type": "TextLabel", "text": "Touch me", - "styles": ["basic-text"], + "styles": ["basicText"], "position": [0, -120, 0], "size": [200, 200, 1], "orientation": [0, 0, 30], @@ -99,8 +99,8 @@ }, { "name":"greeting2", "type": "TextLabel", - "parent-origin": "CENTER", - "anchor-point": "CENTER", + "parentOrigin": "CENTER", + "anchorPoint": "CENTER", "size": [200, 200, 1], "orientation": [0, 0, 39], "position": [-150, -50, 0], @@ -108,12 +108,12 @@ "signals": [{ "name": "touched", "action": "play", - "animation": "path-animation" + "animation": "pathAnimation" }] }, { "type": "TextLabel", // styles can be additive - "parent-origin": "CENTER", - "anchor-point": "CENTER", + "parentOrigin": "CENTER", + "anchorPoint": "CENTER", "size": [200, 200, 1], "text": "or the image.." }, { @@ -122,7 +122,7 @@ "image": { "filename": "{DALI_IMAGE_DIR}gallery-large-21.jpg" }, - "relayout-enabled": false, + "relayoutEnabled": false, "position": [0, 200, 0], "size": [200, 200, 1], "signals": [{ @@ -130,6 +130,6 @@ "action": "play", "animation": "rotate" }], - "position-inheritance": "DONT_INHERIT_POSITION" + "positionInheritance": "DONT_INHERIT_POSITION" }] } diff --git a/resources/scripts/background-color.json b/resources/scripts/background-color.json index f383657..f8ad659 100644 --- a/resources/scripts/background-color.json +++ b/resources/scripts/background-color.json @@ -19,12 +19,12 @@ // A TextLabel with a red background { "type": "TextLabel", - "draw-mode": "OVERLAY_2D", + "drawMode": "OVERLAY_2D", "text": "Hello World", - "parent-origin": "TOP_CENTER", - "anchor-point": "TOP_CENTER", + "parentOrigin": "TOP_CENTER", + "anchorPoint": "TOP_CENTER", "position": [0, 50, 0], - "point-size": 40, + "pointSize": 40, "size": [400, 150, 1], "background":{ "color": [1, 0, 0, 1] @@ -34,9 +34,9 @@ // A container with a yellow background { "type": "Control", - "relayout-enabled": false, - "parent-origin": "CENTER", - "anchor-point": "BOTTOM_CENTER", + "relayoutEnabled": false, + "parentOrigin": "CENTER", + "anchorPoint": "BOTTOM_CENTER", "size": [400, 150, 1], "background":{ "color": [1, 1, 0, 1] @@ -46,9 +46,9 @@ // A container with an image { "type": "Control", - "relayout-enabled": false, - "parent-origin": "CENTER", - "anchor-point": "TOP_CENTER", + "relayoutEnabled": false, + "parentOrigin": "CENTER", + "anchorPoint": "TOP_CENTER", "size": [400, 150, 1], "background": { "filename": "{DALI_IMAGE_DIR}button-background.png" @@ -58,9 +58,9 @@ // A container with the same image blended in with a blue background { "type": "Control", - "relayout-enabled": false, - "parent-origin": "BOTTOM_CENTER", - "anchor-point": "BOTTOM_CENTER", + "relayoutEnabled": false, + "parentOrigin": "BOTTOM_CENTER", + "anchorPoint": "BOTTOM_CENTER", "size": [400, 150, 1], "background": { "filename": "{DALI_IMAGE_DIR}button-background.png" diff --git a/resources/scripts/button.json b/resources/scripts/button.json index 481d11d..1541aff 100644 --- a/resources/scripts/button.json +++ b/resources/scripts/button.json @@ -22,46 +22,46 @@ // First Button { "type": "PushButton", - "parent-origin": "TOP_CENTER", - "anchor-point": "TOP_CENTER", + "parentOrigin": "TOP_CENTER", + "anchorPoint": "TOP_CENTER", "position": [0, 0, 0], "size": [400, 200, 0], - "unselected-state-image": "{DALI_IMAGE_DIR}blocks-brick-1.png", - "selected-state-image": "{DALI_IMAGE_DIR}blocks-brick-2.png", - "label-text": "Normal" + "unselectedStateImage": "{DALI_IMAGE_DIR}blocks-brick-1.png", + "selectedStateImage": "{DALI_IMAGE_DIR}blocks-brick-2.png", + "labelText": "Normal" }, // Second Button { "type": "PushButton", - "parent-origin": "CENTER", - "anchor-point": "CENTER", + "parentOrigin": "CENTER", + "anchorPoint": "CENTER", "position": [0, 0, 0], "size": [400, 200, 0], "disabled": true, - "unselected-state-image": "{DALI_IMAGE_DIR}blocks-brick-1.png", - "selected-state-image": "{DALI_IMAGE_DIR}blocks-brick-2.png", - "disabled-state-image": "{DALI_IMAGE_DIR}blocks-brick-3.png", - "label-text": "Disabled" + "unselectedStateImage": "{DALI_IMAGE_DIR}blocks-brick-1.png", + "selectedStateImage": "{DALI_IMAGE_DIR}blocks-brick-2.png", + "disabledStateImage": "{DALI_IMAGE_DIR}blocks-brick-3.png", + "labelText": "Disabled" }, // Third Button { "type": "PushButton", - "name": "toggle-button", - "parent-origin": "BOTTOM_CENTER", - "anchor-point": "BOTTOM_CENTER", + "name": "toggleButton", + "parentOrigin": "BOTTOM_CENTER", + "anchorPoint": "BOTTOM_CENTER", "position": [0, 0, 0], "size": [400, 200, 0], "togglable": true, - "unselected-state-image": "{DALI_IMAGE_DIR}blocks-brick-1.png", - "selected-state-image": "{DALI_IMAGE_DIR}blocks-brick-3.png", - "label-text": "Toggle", + "unselectedStateImage": "{DALI_IMAGE_DIR}blocks-brick-1.png", + "selectedStateImage": "{DALI_IMAGE_DIR}blocks-brick-3.png", + "labelText": "Toggle", "signals": [{ "name": "selected", "action": "set", - "actor": "toggle-button", - "property": "label-actor", + "actor": "toggleButton", + "property": "labelActor", "value": { "type": "TextLabel", "text": "Using a 9-patch image" diff --git a/resources/scripts/choreography.json b/resources/scripts/choreography.json index 322ffc4..b57baa4 100644 --- a/resources/scripts/choreography.json +++ b/resources/scripts/choreography.json @@ -1,10 +1,10 @@ { "templates": { - "circle-control": + "circleControl": { "type": "ImageActor", - "inherit-position": true, + "inheritPosition": true, "size": [ 70, 70, @@ -20,7 +20,7 @@ "filename": "{DALI_IMAGE_DIR}circle.png" } }, - "rectangle-control": + "rectangleControl": { "type": "Control", "size": [ @@ -29,7 +29,7 @@ 1 ], "background": {"color": [0.95, 0.41, 0.18, 1] }, - "color-alpha": 0 + "colorAlpha": 0 } }, "stage": [ @@ -42,7 +42,7 @@ 105, 0 ], - "inherit-position": true, + "inheritPosition": true, "size": [ 20, 20, @@ -50,10 +50,10 @@ ], "sizeAspectRatio": false, "background": { "color": [0.85, 0.75, 0.45, 1] }, - "color-alpha": 0 + "colorAlpha": 0 }, { - "type": "circle-control", + "type": "circleControl", "name": "Circle1", "position": [ 84, @@ -69,7 +69,7 @@ ] }, { - "type": "circle-control", + "type": "circleControl", "name": "Circle2", "position": [ 151, @@ -78,7 +78,7 @@ ] }, { - "type": "circle-control", + "type": "circleControl", "name": "Circle3", "position": [ 285, @@ -87,7 +87,7 @@ ] }, { - "type": "circle-control", + "type": "circleControl", "name": "Circle4", "position": [ 218, @@ -96,7 +96,7 @@ ] }, { - "type": "rectangle-control", + "type": "rectangleControl", "name": "Rect1", "position": [ 50, @@ -105,7 +105,7 @@ ] }, { - "type": "rectangle-control", + "type": "rectangleControl", "name": "Rect2", "position": [ 120, @@ -114,7 +114,7 @@ ] }, { - "type": "rectangle-control", + "type": "rectangleControl", "name": "Rect3", "position": [ 190, @@ -123,7 +123,7 @@ ] }, { - "type": "rectangle-control", + "type": "rectangleControl", "name": "Rect4", "position": [ 260, @@ -143,8 +143,8 @@ 198, -1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0, "duration": 0.025 }, @@ -158,8 +158,8 @@ 190, -1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0, "duration": 0.05 }, @@ -173,8 +173,8 @@ 170, -1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.05, "duration": 0.05 }, @@ -188,8 +188,8 @@ 150, -1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.1, "duration": 0.051 }, @@ -203,8 +203,8 @@ 125, -1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.151, "duration": 0.049 }, @@ -218,8 +218,8 @@ 100, -1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.2, "duration": 0.051 }, @@ -233,8 +233,8 @@ 70, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0, "duration": 0.025 }, @@ -248,8 +248,8 @@ 20, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.151, "duration": 0.1 }, @@ -263,8 +263,8 @@ 1, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0, "duration": 0.025 }, @@ -278,8 +278,8 @@ 0.1, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0, "duration": 0.325 }, @@ -293,8 +293,8 @@ 1, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0, "duration": 0.025 }, @@ -308,8 +308,8 @@ 0.1, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.049, "duration": 0.301 }, @@ -323,8 +323,8 @@ 1, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0, "duration": 0.025 }, @@ -338,8 +338,8 @@ 0.1, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.1, "duration": 0.272 }, @@ -353,8 +353,8 @@ 20, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0, "duration": 0.025 }, @@ -368,8 +368,8 @@ 210, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.227, "duration": 0.122 }, @@ -377,10 +377,10 @@ }, { "actor": "topContainer", - "property": "color-alpha", + "property": "colorAlpha", "value": 0, - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0, "duration": 0.025 }, @@ -388,10 +388,10 @@ }, { "actor": "topContainer", - "property": "color-alpha", + "property": "colorAlpha", "value": 1, - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.101, "duration": 0.249 }, @@ -405,8 +405,8 @@ 280, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.1, "duration": 0.075 }, @@ -420,8 +420,8 @@ 260, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.175, "duration": 0.075 }, @@ -435,8 +435,8 @@ 250, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.25, "duration": 0.075 }, @@ -444,10 +444,10 @@ }, { "actor": "Rect1", - "property": "color-alpha", + "property": "colorAlpha", "value": 0, - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0, "duration": 0.025 }, @@ -455,10 +455,10 @@ }, { "actor": "Rect1", - "property": "color-alpha", + "property": "colorAlpha", "value": 1, - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0, "duration": 0.325 }, @@ -472,8 +472,8 @@ 280, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.148, "duration": 0.077 }, @@ -487,8 +487,8 @@ 260, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.225, "duration": 0.075 }, @@ -502,8 +502,8 @@ 250, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.3, "duration": 0.072 }, @@ -511,10 +511,10 @@ }, { "actor": "Rect2", - "property": "color-alpha", + "property": "colorAlpha", "value": 0, - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0, "duration": 0.025 }, @@ -522,10 +522,10 @@ }, { "actor": "Rect2", - "property": "color-alpha", + "property": "colorAlpha", "value": 1, - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.05, "duration": 0.322 }, @@ -539,8 +539,8 @@ 280, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.2, "duration": 0.074 }, @@ -554,8 +554,8 @@ 260, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.274, "duration": 0.073 }, @@ -569,8 +569,8 @@ 250, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.347, "duration": 0.078 }, @@ -578,10 +578,10 @@ }, { "actor": "Rect3", - "property": "color-alpha", + "property": "colorAlpha", "value": 0, - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0, "duration": 0.025 }, @@ -589,10 +589,10 @@ }, { "actor": "Rect3", - "property": "color-alpha", + "property": "colorAlpha", "value": 1, - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.099, "duration": 0.326 }, @@ -606,8 +606,8 @@ 280, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.251, "duration": 0.075 }, @@ -621,8 +621,8 @@ 260, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.326, "duration": 0.074 }, @@ -636,8 +636,8 @@ 250, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.4, "duration": 0.075 }, @@ -645,10 +645,10 @@ }, { "actor": "Rect4", - "property": "color-alpha", + "property": "colorAlpha", "value": 0, - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0, "duration": 0.025 }, @@ -656,10 +656,10 @@ }, { "actor": "Rect4", - "property": "color-alpha", + "property": "colorAlpha", "value": 1, - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.148, "duration": 0.327 }, diff --git a/resources/scripts/contacts.json b/resources/scripts/contacts.json index 267f8fd..723008b 100644 --- a/resources/scripts/contacts.json +++ b/resources/scripts/contacts.json @@ -3,9 +3,9 @@ { "type": "Control", "background": {"color": [ 1, 1, 1, 1 ]}, - "parent-origin": "TOP_LEFT", - "anchor-point": "TOP_LEFT", - "draw-mode": "STENCIL", + "parentOrigin": "TOP_LEFT", + "anchorPoint": "TOP_LEFT", + "drawMode": "STENCIL", "size": [ 360, 630, 0 ] }, { @@ -17,7 +17,7 @@ 317, -1 ], - "inherit-position": true, + "inheritPosition": true, "size": [ 360, 640, @@ -28,8 +28,8 @@ "filename": "{DALI_IMAGE_DIR}contacts-main.png", "width": 361, "height": 640, - "load-policy": "IMMEDIATE", - "release-policy": "NEVER" + "loadPolicy": "IMMEDIATE", + "releasePolicy": "NEVER" }, "signals": [ { @@ -48,7 +48,7 @@ 139, 0 ], - "inherit-position": true, + "inheritPosition": true, "size": [ 360, 282, @@ -59,8 +59,8 @@ "filename": "{DALI_IMAGE_DIR}contacts-background.png", "width": 360, "height": 282, - "load-policy": "IMMEDIATE", - "release-policy": "NEVER" + "loadPolicy": "IMMEDIATE", + "releasePolicy": "NEVER" } }, { @@ -72,7 +72,7 @@ 824.0520479877184, 0 ], - "inherit-position": true, + "inheritPosition": true, "size": [ 393.04, 378.08, @@ -96,7 +96,7 @@ 402.004657366638, 1 ], - "inherit-position": true, + "inheritPosition": true, "size": [ 53, 52, @@ -107,8 +107,8 @@ "filename": "{DALI_IMAGE_DIR}contacts-image.png", "width": 53, "height": 52, - "load-policy": "IMMEDIATE", - "release-policy": "NEVER" + "loadPolicy": "IMMEDIATE", + "releasePolicy": "NEVER" } }, { @@ -120,14 +120,14 @@ 405, 1 ], - "inherit-position": true, + "inheritPosition": true, "size": [ 152.89, 24.33, 1 ], "sizeAspectRatio": false, - "markup-enabled": true, + "markupEnabled": true, "color": [ 0.2, 0.2, @@ -147,7 +147,7 @@ 611.5127067356418, 1 ], - "inherit-position": true, + "inheritPosition": true, "size": [ 80, 71, @@ -158,8 +158,8 @@ "filename": "{DALI_IMAGE_DIR}contacts-add.png", "width": 80, "height": 71, - "load-policy": "IMMEDIATE", - "release-policy": "NEVER" + "loadPolicy": "IMMEDIATE", + "releasePolicy": "NEVER" } }, { @@ -171,7 +171,7 @@ 677.5051724136168, 0 ], - "inherit-position": true, + "inheritPosition": true, "size": [ 360, 77, @@ -182,8 +182,8 @@ "filename": "{DALI_IMAGE_DIR}contacts-messenger.png", "width": 360, "height": 77, - "load-policy": "IMMEDIATE", - "release-policy": "NEVER" + "loadPolicy": "IMMEDIATE", + "releasePolicy": "NEVER" } }, { @@ -195,7 +195,7 @@ 704.5075140543304, 0 ], - "inherit-position": true, + "inheritPosition": true, "size": [ 360, 79, @@ -206,8 +206,8 @@ "filename": "{DALI_IMAGE_DIR}contacts-email.png", "width": 360, "height": 79, - "load-policy": "IMMEDIATE", - "release-policy": "NEVER" + "loadPolicy": "IMMEDIATE", + "releasePolicy": "NEVER" } }, { @@ -219,7 +219,7 @@ 727.0088875903122, 0 ], - "inherit-position": true, + "inheritPosition": true, "size": [ 360, 80, @@ -230,8 +230,8 @@ "filename": "{DALI_IMAGE_DIR}contacts-mobile.png", "width": 360, "height": 80, - "load-policy": "IMMEDIATE", - "release-policy": "NEVER" + "loadPolicy": "IMMEDIATE", + "releasePolicy": "NEVER" } }, { @@ -243,7 +243,7 @@ 749.5101801844454, 0 ], - "inherit-position": true, + "inheritPosition": true, "size": [ 360, 75, @@ -254,8 +254,8 @@ "filename": "{DALI_IMAGE_DIR}contacts-home.png", "width": 360, "height": 75, - "load-policy": "IMMEDIATE", - "release-policy": "NEVER" + "loadPolicy": "IMMEDIATE", + "releasePolicy": "NEVER" } }, { @@ -267,7 +267,7 @@ 50.289953613295076, 1 ], - "inherit-position": true, + "inheritPosition": true, "size": [ 25, 20.55, @@ -278,8 +278,8 @@ "filename": "{DALI_IMAGE_DIR}contacts-circle.png", "width": 100, "height": 100, - "load-policy": "IMMEDIATE", - "release-policy": "NEVER" + "loadPolicy": "IMMEDIATE", + "releasePolicy": "NEVER" } }, { @@ -291,7 +291,7 @@ 817.499887599389, 0 ], - "inherit-position": true, + "inheritPosition": true, "size": [ 360, 77, @@ -302,8 +302,8 @@ "filename": "{DALI_IMAGE_DIR}contacts-plain.png", "width": 360, "height": 77, - "load-policy": "IMMEDIATE", - "release-policy": "NEVER" + "loadPolicy": "IMMEDIATE", + "releasePolicy": "NEVER" } }, { @@ -315,7 +315,7 @@ 401.485, 0 ], - "inherit-position": true, + "inheritPosition": true, "size": [ 693.96, 84.97, @@ -347,8 +347,8 @@ 609.5059654033565, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.503, "duration": 0.005 }, @@ -362,8 +362,8 @@ 20, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 4.071, "duration": 0.005 }, @@ -377,8 +377,8 @@ 71, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 4.498, "duration": 0.3 }, @@ -392,8 +392,8 @@ 611.5150431968526, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 4.498, "duration": 0.005 }, @@ -407,8 +407,8 @@ 239.01, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 1.22, "duration": 0.396 }, @@ -422,8 +422,8 @@ 402, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 4.437, "duration": 0.396 }, @@ -437,8 +437,8 @@ 242, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 1.22, "duration": 0.395 }, @@ -453,8 +453,8 @@ 1, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 1.22, "duration": 0.395 }, @@ -468,8 +468,8 @@ 35.33, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 1.22, "duration": 0.395 }, @@ -483,8 +483,8 @@ 405, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 4.435, "duration": 0.395 }, @@ -499,8 +499,8 @@ 0.2, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 4.435, "duration": 0.395 }, @@ -514,8 +514,8 @@ 24.33, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 4.435, "duration": 0.395 }, @@ -529,8 +529,8 @@ 138.98, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 1.222, "duration": 0.391 }, @@ -544,8 +544,8 @@ 138.98, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 4.435, "duration": 0.391 }, @@ -559,8 +559,8 @@ 320.50795521899136, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 1.346, "duration": 0.372 }, @@ -574,8 +574,8 @@ 677.51, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 4.34, "duration": 0.372 }, @@ -589,8 +589,8 @@ 395.5, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 1.432, "duration": 0.39 }, @@ -604,8 +604,8 @@ 704.5, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 4.218, "duration": 0.39 }, @@ -619,8 +619,8 @@ 470.01, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 1.543, "duration": 0.385 }, @@ -634,8 +634,8 @@ 727.01, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 4.11, "duration": 0.385 }, @@ -649,8 +649,8 @@ 541.5, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 1.635, "duration": 0.406 }, @@ -664,8 +664,8 @@ 749.5, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 3.993, "duration": 0.406 }, @@ -679,8 +679,8 @@ 608.5139116202711, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 1.726, "duration": 0.435 }, @@ -694,8 +694,8 @@ 817.51, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 3.865, "duration": 0.435 }, @@ -709,8 +709,8 @@ 48.280475138643396, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 2.66, "duration": 0.005 }, @@ -724,8 +724,8 @@ 48.280475138643396, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 2.851, "duration": 0.008 }, @@ -739,8 +739,8 @@ 80, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 2.665, "duration": 1.187 }, @@ -754,8 +754,8 @@ 470.05397482417106, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 1.031, "duration": 0.561 }, @@ -769,8 +769,8 @@ 467.042499801712, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 4.342, "duration": 0.005 }, @@ -784,8 +784,8 @@ 402.425, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0, "duration": 0.904 }, diff --git a/resources/scripts/gallery.json b/resources/scripts/gallery.json index 0fdb7ab..43fe3d0 100644 --- a/resources/scripts/gallery.json +++ b/resources/scripts/gallery.json @@ -1,26 +1,26 @@ { "templates": { - "selection-type": + "selectionType": { "type": "Control", "background": {"color": [ 1, 0.5, 0, 0.6 ]}, - "color-alpha": 0.05, - "parent-origin": "CENTER", - "anchor-point": "CENTER", + "colorAlpha": 0.05, + "parentOrigin": "CENTER", + "anchorPoint": "CENTER", "size": [ 450, 90, 1 ] }, - "image-type": + "imageType": { "type": "ImageActor", "position": [ 450, 0, 1 ], - "parent-origin": "CENTER", - "anchor-point": "CENTER", + "parentOrigin": "CENTER", + "anchorPoint": "CENTER", "size": [ 450, 795, 1 ], "actors": [ { "type": "Control", - "position-inheritance": "USE_PARENT_POSITION", + "positionInheritance": "USE_PARENT_POSITION", "size": [ 450, 795, 1 ], "signals": [ { @@ -38,18 +38,18 @@ "type": "Control", "name": "stencil", "background": {"color": [ 1, 1, 1, 1 ]}, - "parent-origin": "CENTER", - "anchor-point": "CENTER", - "draw-mode": "STENCIL", + "parentOrigin": "CENTER", + "anchorPoint": "CENTER", + "drawMode": "STENCIL", "size": [ 450, 795, 0 ], - "position-z": 0.1 + "positionZ": 0.1 }, { "type": "ImageActor", "actors": [], "name": "list", - "parent-origin": "CENTER", - "anchor-point": "CENTER", + "parentOrigin": "CENTER", + "anchorPoint": "CENTER", "position": [ 0, 0, -1 ], "size": [ 450, 795, 1 ], "image": { @@ -57,9 +57,9 @@ } }, { - "type": "selection-type", - "name": "selection-1", - "position-y": -105, + "type": "selectionType", + "name": "selection1", + "positionY": -105, "signals": [ { "name": "tapped", @@ -69,9 +69,9 @@ ] }, { - "type": "selection-type", - "name": "selection-2", - "position-y": -15, + "type": "selectionType", + "name": "selection2", + "positionY": -15, "signals": [ { "name": "tapped", @@ -81,9 +81,9 @@ ] }, { - "type": "selection-type", - "name": "selection-3", - "position-y": 75, + "type": "selectionType", + "name": "selection3", + "positionY": 75, "signals": [ { "name": "tapped", @@ -93,9 +93,9 @@ ] }, { - "type": "selection-type", - "name": "selection-4", - "position-y": 165, + "type": "selectionType", + "name": "selection4", + "positionY": 165, "signals": [ { "name": "tapped", @@ -105,9 +105,9 @@ ] }, { - "type": "selection-type", - "name": "selection-5", - "position-y": 255, + "type": "selectionType", + "name": "selection5", + "positionY": 255, "signals": [ { "name": "tapped", @@ -117,36 +117,36 @@ ] }, { - "type": "image-type", - "name": "picture-1", + "type": "imageType", + "name": "picture1", "image": { "filename": "{DALI_IMAGE_DIR}animation-picture-1.png" } }, { - "type": "image-type", - "name": "picture-2", + "type": "imageType", + "name": "picture2", "image": { "filename": "{DALI_IMAGE_DIR}animation-picture-2.png" } }, { - "type": "image-type", - "name": "picture-3", + "type": "imageType", + "name": "picture3", "image": { "filename": "{DALI_IMAGE_DIR}animation-picture-3.png" } }, { - "type": "image-type", - "name": "picture-4", + "type": "imageType", + "name": "picture4", "image": { "filename": "{DALI_IMAGE_DIR}animation-picture-4.png" } }, { - "type": "image-type", - "name": "picture-5", + "type": "imageType", + "name": "picture5", "image": { "filename": "{DALI_IMAGE_DIR}animation-picture-5.png" } @@ -156,22 +156,22 @@ "Animation_1": { "properties": [ { - "actor": "selection-1", - "property": "color-alpha", + "actor": "selection1", + "property": "colorAlpha", "value": 0.5, - "alpha-function": "SIN", - "time-period": { + "alphaFunction": "SIN", + "timePeriod": { "delay": 0, "duration": 0.5 }, "timelineColor": "#83bcc5" }, { - "actor": "picture-1", - "property": "position-x", + "actor": "picture1", + "property": "positionX", "value": 0, - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.25, "duration": 0.25 }, @@ -182,22 +182,22 @@ "Animation_2": { "properties": [ { - "actor": "selection-2", - "property": "color-alpha", + "actor": "selection2", + "property": "colorAlpha", "value": 0.5, - "alpha-function": "SIN", - "time-period": { + "alphaFunction": "SIN", + "timePeriod": { "delay": 0, "duration": 0.5 }, "timelineColor": "#83bcc5" }, { - "actor": "picture-2", - "property": "position-x", + "actor": "picture2", + "property": "positionX", "value": 0, - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.25, "duration": 0.25 }, @@ -208,22 +208,22 @@ "Animation_3": { "properties": [ { - "actor": "selection-3", - "property": "color-alpha", + "actor": "selection3", + "property": "colorAlpha", "value": 0.5, - "alpha-function": "SIN", - "time-period": { + "alphaFunction": "SIN", + "timePeriod": { "delay": 0, "duration": 0.5 }, "timelineColor": "#83bcc5" }, { - "actor": "picture-3", - "property": "position-x", + "actor": "picture3", + "property": "positionX", "value": 0, - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.25, "duration": 0.25 }, @@ -234,22 +234,22 @@ "Animation_4": { "properties": [ { - "actor": "selection-4", - "property": "color-alpha", + "actor": "selection4", + "property": "colorAlpha", "value": 0.5, - "alpha-function": "SIN", - "time-period": { + "alphaFunction": "SIN", + "timePeriod": { "delay": 0, "duration": 0.5 }, "timelineColor": "#83bcc5" }, { - "actor": "picture-4", - "property": "position-x", + "actor": "picture4", + "property": "positionX", "value": 0, - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.25, "duration": 0.25 }, @@ -260,22 +260,22 @@ "Animation_5": { "properties": [ { - "actor": "selection-5", - "property": "color-alpha", + "actor": "selection5", + "property": "colorAlpha", "value": 0.5, - "alpha-function": "SIN", - "time-period": { + "alphaFunction": "SIN", + "timePeriod": { "delay": 0, "duration": 0.5 }, "timelineColor": "#83bcc5" }, { - "actor": "picture-5", - "property": "position-x", + "actor": "picture5", + "property": "positionX", "value": 0, - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.25, "duration": 0.25 }, @@ -286,55 +286,55 @@ "BackAnimation": { "properties": [ { - "actor": "picture-1", - "property": "position-x", + "actor": "picture1", + "property": "positionX", "value": 450, - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0, "duration": 0.25 }, "timelineColor": "#83bcc5" }, { - "actor": "picture-2", - "property": "position-x", + "actor": "picture2", + "property": "positionX", "value": 450, - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0, "duration": 0.25 }, "timelineColor": "#83bcc5" }, { - "actor": "picture-3", - "property": "position-x", + "actor": "picture3", + "property": "positionX", "value": 450, - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0, "duration": 0.25 }, "timelineColor": "#83bcc5" }, { - "actor": "picture-4", - "property": "position-x", + "actor": "picture4", + "property": "positionX", "value": 450, - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0, "duration": 0.25 }, "timelineColor": "#83bcc5" }, { - "actor": "picture-5", - "property": "position-x", + "actor": "picture5", + "property": "positionX", "value": 450, - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0, "duration": 0.25 }, diff --git a/resources/scripts/hello-world.json b/resources/scripts/hello-world.json index f92b710..6de3782 100644 --- a/resources/scripts/hello-world.json +++ b/resources/scripts/hello-world.json @@ -19,6 +19,6 @@ "stage": [{ "type": "TextLabel", "text": "Hello World", - "parent-origin": "CENTER" + "parentOrigin": "CENTER" }] } diff --git a/resources/scripts/music-library.json b/resources/scripts/music-library.json index 6d15238..dc197a0 100644 --- a/resources/scripts/music-library.json +++ b/resources/scripts/music-library.json @@ -3,9 +3,9 @@ { "type": "Control", "background": {"color": [ 1, 1, 1, 1 ]}, - "parent-origin": "TOP_LEFT", - "anchor-point": "TOP_LEFT", - "draw-mode": "STENCIL", + "parentOrigin": "TOP_LEFT", + "anchorPoint": "TOP_LEFT", + "drawMode": "STENCIL", "size": [ 400, 720, 0 ] }, { @@ -17,7 +17,7 @@ 355, -1 ], - "inherit-position": true, + "inheritPosition": true, "size": [ 400, 630, @@ -28,8 +28,8 @@ "filename": "{DALI_IMAGE_DIR}music-libray-main-screen.png", "width": 545, "height": 860, - "load-policy": "IMMEDIATE", - "release-policy": "NEVER" + "loadPolicy": "IMMEDIATE", + "releasePolicy": "NEVER" } }, { @@ -44,7 +44,7 @@ 25, 1 ], - "inherit-position": true, + "inheritPosition": true, "size": [ 30, 30, @@ -55,8 +55,8 @@ "filename": "{DALI_IMAGE_DIR}music-libray-circle.png", "width": 128, "height": 128, - "load-policy": "IMMEDIATE", - "release-policy": "NEVER" + "loadPolicy": "IMMEDIATE", + "releasePolicy": "NEVER" } }, { @@ -68,7 +68,7 @@ 25, 1 ], - "inherit-position": true, + "inheritPosition": true, "size": [ 28.030303030303028, 30, @@ -79,8 +79,8 @@ "filename": "{DALI_IMAGE_DIR}music-libray-triangle.png", "width": 185, "height": 198, - "load-policy": "IMMEDIATE", - "release-policy": "NEVER" + "loadPolicy": "IMMEDIATE", + "releasePolicy": "NEVER" } }, { @@ -92,7 +92,7 @@ 25, 1 ], - "inherit-position": true, + "inheritPosition": true, "size": [ 30, 30, @@ -103,8 +103,8 @@ "filename": "{DALI_IMAGE_DIR}music-libray-rectangle.png", "width": 128, "height": 128, - "load-policy": "IMMEDIATE", - "release-policy": "NEVER" + "loadPolicy": "IMMEDIATE", + "releasePolicy": "NEVER" } } ], @@ -114,7 +114,7 @@ 695, 1 ], - "inherit-position": true, + "inheritPosition": true, "size": [ 400, 50, @@ -140,7 +140,7 @@ 20, 0 ], - "inherit-position": true, + "inheritPosition": true, "size": [ 50, 20, @@ -148,7 +148,7 @@ ], "sizeAspectRatio": false, "text": "12:30", - "point-size": 10 + "pointSize": 10 } ], "name": "Indicators", @@ -157,7 +157,7 @@ 20, 0 ], - "inherit-position": true, + "inheritPosition": true, "size": [ 400, 40, @@ -186,7 +186,7 @@ 288, 0 ], - "inherit-position": true, + "inheritPosition": true, "size": [ 200, 35, @@ -198,8 +198,8 @@ "filename": "{DALI_IMAGE_DIR}music-libray-foxtrot-oscar.png", "width": 545, "height": 95, - "load-policy": "IMMEDIATE", - "release-policy": "NEVER" + "loadPolicy": "IMMEDIATE", + "releasePolicy": "NEVER" } }, { @@ -211,7 +211,7 @@ 288, 0 ], - "inherit-position": true, + "inheritPosition": true, "size": [ 200, 35, @@ -240,7 +240,7 @@ 266, 0 ], - "inherit-position": true, + "inheritPosition": true, "size": [ 200, 80, @@ -254,8 +254,8 @@ "filename": "{DALI_IMAGE_DIR}music-libray-the-solars.png", "width": 545, "height": 218, - "load-policy": "IMMEDIATE", - "release-policy": "NEVER" + "loadPolicy": "IMMEDIATE", + "releasePolicy": "NEVER" } }, { @@ -267,7 +267,7 @@ 266, 0 ], - "inherit-position": true, + "inheritPosition": true, "size": [ 200, 80, @@ -288,7 +288,7 @@ "type": "Control", "name": "Tapped Record", "actors": [], - "position-inheritance":"USE_PARENT_POSITION", + "positionInheritance":"USE_PARENT_POSITION", "signals": [ { "name": "tapped", @@ -309,7 +309,7 @@ 206, 0 ], - "inherit-position": true, + "inheritPosition": true, "size": [ 200, 200, @@ -320,8 +320,8 @@ "filename": "{DALI_IMAGE_DIR}music-libray-record-cover.png", "width": 545, "height": 502, - "load-policy": "IMMEDIATE", - "release-policy": "NEVER" + "loadPolicy": "IMMEDIATE", + "releasePolicy": "NEVER" } }, { @@ -333,7 +333,7 @@ 70, 2 ], - "inherit-position": true, + "inheritPosition": true, "size": [ 30, 30, @@ -344,8 +344,8 @@ "filename": "{DALI_IMAGE_DIR}music-libray-arrow.png", "width": 128, "height": 128, - "load-policy": "IMMEDIATE", - "release-policy": "NEVER" + "loadPolicy": "IMMEDIATE", + "releasePolicy": "NEVER" } }, { @@ -357,7 +357,7 @@ 70, 2 ], - "inherit-position": true, + "inheritPosition": true, "size": [ 30, 30, @@ -368,8 +368,8 @@ "filename": "{DALI_IMAGE_DIR}music-libray-star.png", "width": 121, "height": 128, - "load-policy": "IMMEDIATE", - "release-policy": "NEVER" + "loadPolicy": "IMMEDIATE", + "releasePolicy": "NEVER" } }, { @@ -381,7 +381,7 @@ 440, 3 ], - "inherit-position": true, + "inheritPosition": true, "size": [ 50, 50, @@ -397,8 +397,8 @@ "filename": "{DALI_IMAGE_DIR}music-libray-pause.png", "width": 128, "height": 128, - "load-policy": "IMMEDIATE", - "release-policy": "NEVER" + "loadPolicy": "IMMEDIATE", + "releasePolicy": "NEVER" } }, { @@ -410,7 +410,7 @@ 70, 2 ], - "inherit-position": true, + "inheritPosition": true, "size": [ 30, 30, @@ -421,8 +421,8 @@ "filename": "{DALI_IMAGE_DIR}music-libray-menu.png", "width": 32, "height": 32, - "load-policy": "IMMEDIATE", - "release-policy": "NEVER" + "loadPolicy": "IMMEDIATE", + "releasePolicy": "NEVER" } } ], @@ -431,10 +431,10 @@ "properties": [ { "actor": "Tapped Record", - "property": "color-alpha", + "property": "colorAlpha", "value": 0, - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0, "duration": 0.1 }, @@ -448,8 +448,8 @@ 240, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0, "duration": 0.3 }, @@ -463,8 +463,8 @@ 2, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0, "duration": 0.3 }, @@ -479,8 +479,8 @@ 0.6509803921568628, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.3, "duration": 0.2 }, @@ -494,8 +494,8 @@ 360, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0, "duration": 0.3 }, @@ -509,8 +509,8 @@ 520, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.3, "duration": 0.2 }, @@ -524,8 +524,8 @@ 2, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0, "duration": 0.3 }, @@ -539,8 +539,8 @@ 360, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0, "duration": 0.3 }, @@ -554,8 +554,8 @@ 520, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.3, "duration": 0.2 }, @@ -569,8 +569,8 @@ 2, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0, "duration": 0.3 }, @@ -585,8 +585,8 @@ 1, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.5, "duration": 0.2 }, @@ -600,8 +600,8 @@ 288, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0, "duration": 0.3 }, @@ -615,8 +615,8 @@ 635, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.3, "duration": 0.2 }, @@ -630,8 +630,8 @@ 2, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0, "duration": 0.3 }, @@ -645,8 +645,8 @@ 288, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0, "duration": 0.3 }, @@ -660,8 +660,8 @@ 635, 0 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.3, "duration": 0.2 }, @@ -675,8 +675,8 @@ 2, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0, "duration": 0.3 }, @@ -691,8 +691,8 @@ 1, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.5, "duration": 0.2 }, @@ -706,8 +706,8 @@ 70, 2 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.3, "duration": 0.2 }, @@ -721,8 +721,8 @@ 70, 2 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.299, "duration": 0.2 }, @@ -736,8 +736,8 @@ 70, 2 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.3, "duration": 0.2 }, @@ -751,8 +751,8 @@ 440, 3 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.599, "duration": 0.1 }, @@ -766,8 +766,8 @@ 0.1, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.6, "duration": 0.1 }, @@ -781,8 +781,8 @@ 1, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.7, "duration": 0.3 }, diff --git a/resources/scripts/popup.json b/resources/scripts/popup.json index 70a2eef..9111394 100644 --- a/resources/scripts/popup.json +++ b/resources/scripts/popup.json @@ -5,98 +5,98 @@ "stage": [ { "type": "ConfirmationPopup", - "name": "confirmation-popup", - "parent-origin": [0.5, 0.55, 0.5], - "anchor-point": "CENTER", - "width-resize-policy": "SIZE_RELATIVE_TO_PARENT", - "height-resize-policy": "USE_NATURAL_SIZE", - "size-mode-factor": [0.65, 1.0, 1.0], - "tail-visibility": false, - "tail-position": [0, 0, 0], - "display-change-animation-duration": 1.0, - "contextual-mode": "NON_CONTEXTUAL", - "animation-mode": "ZOOM", - "control-ok": "control-ok", - "control-cancel": "control-cancel", - "connect-signal-ok-selected": "clicked", - "connect-signal-cancel-selected": "clicked", + "name": "confirmationPopup", + "parentOrigin": [0.5, 0.55, 0.5], + "anchorPoint": "CENTER", + "widthResizePolicy": "SIZE_RELATIVE_TO_PARENT", + "heightResizePolicy": "USE_NATURAL_SIZE", + "sizeModeFactor": [0.65, 1.0, 1.0], + "tailVisibility": false, + "tailPosition": [0, 0, 0], + "displayChangeAnimationDuration": 1.0, + "contextualMode": "NON_CONTEXTUAL", + "animationMode": "ZOOM", + "controlOk": "controlOk", + "controlCancel": "controlCancel", + "connectSignalOkSelected": "clicked", + "connectSignalCancelSelected": "clicked", "title": { "type": "TextLabel", "text": "Title text", - "text-color": [1, 1, 1, 1] + "textColor": [1, 1, 1, 1] }, "content": { "type": "TextLabel", "text": "Content text", "padding": [20, 20, 20, 0], - "text-color": [1, 1, 1, 1] + "textColor": [1, 1, 1, 1] }, "footer": { "type": "Control", "size": [0, 80, 0], - "width-resize-policy": "FILL_TO_PARENT", - "height-resize-policy": "FIXED", - "parent-origin": "CENTER", - "anchor-point": "CENTER", + "widthResizePolicy": "FILL_TO_PARENT", + "heightResizePolicy": "FIXED", + "parentOrigin": "CENTER", + "anchorPoint": "CENTER", "actors": [ { "type": "PushButton", - "name": "control-ok", - "parent-origin": "CENTER_LEFT", - "anchor-point": "CENTER_LEFT", + "name": "controlOk", + "parentOrigin": "CENTER_LEFT", + "anchorPoint": "CENTER_LEFT", "position": [20, 0, 0], - "label-text": "OK" + "labelText": "OK" }, { "type": "PushButton", - "name": "control-cancel", - "parent-origin": "CENTER_RIGHT", - "anchor-point": "CENTER_RIGHT", + "name": "controlCancel", + "parentOrigin": "CENTER_RIGHT", + "anchorPoint": "CENTER_RIGHT", "position": [-20, 0, 0], - "label-text": "Cancel" + "labelText": "Cancel" } ] }, "signals": [ { - "name": "control-signal-ok", + "name": "controlSignalOk", "action": "set", - "actor": "selection-label", + "actor": "selectionLabel", "property": "text", "value": "User pressed: OK Button" }, { - "name": "control-signal-ok", + "name": "controlSignalOk", "action": "set", - "actor": "confirmation-popup", - "property": "display-state", + "actor": "confirmationPopup", + "property": "displayState", "value": "HIDDEN" }, { - "name": "control-signal-cancel", + "name": "controlSignalCancel", "action": "set", - "actor": "selection-label", + "actor": "selectionLabel", "property": "text", "value": "User pressed: Cancel Button" }, { - "name": "control-signal-cancel", + "name": "controlSignalCancel", "action": "set", - "actor": "confirmation-popup", - "property": "display-state", + "actor": "confirmationPopup", + "property": "displayState", "value": "HIDDEN" }, { - "name": "touched-outside", + "name": "touchedOutside", "action": "set", - "actor": "confirmation-popup", - "property": "display-state", + "actor": "confirmationPopup", + "property": "displayState", "value": "HIDDEN" }, { - "name": "touched-outside", + "name": "touchedOutside", "action": "set", - "actor": "selection-label", + "actor": "selectionLabel", "property": "text", "value": "No button pressed, backing touched" } @@ -104,45 +104,45 @@ }, { "type": "ConfirmationPopup", - "name": "custom-animation-popup", - "parent-origin": [0.5, 0.55, 0.5], - "anchor-point": "CENTER", - "width-resize-policy": "SIZE_RELATIVE_TO_PARENT", - "height-resize-policy": "USE_NATURAL_SIZE", - "size-mode-factor": [0.65, 1.0, 1.0], - "tail-visible": false, - "tail-position": [0, 0, 0], - "display-change-animation-duration": 1.0, - "contextual-mode": "NON_CONTEXTUAL", - "control-ok": "control-ok", - "control-cancel": "control-cancel", - "connect-signal-ok-selected": "clicked", - "connect-signal-cancel-selected": "clicked", - "animation-mode": "CUSTOM", - "entry-animation": { - "actor": "custom-animation-popup", + "name": "customAnimationPopup", + "parentOrigin": [0.5, 0.55, 0.5], + "anchorPoint": "CENTER", + "widthResizePolicy": "SIZE_RELATIVE_TO_PARENT", + "heightResizePolicy": "USE_NATURAL_SIZE", + "sizeModeFactor": [0.65, 1.0, 1.0], + "tailVisible": false, + "tailPosition": [0, 0, 0], + "displayChangeAnimationDuration": 1.0, + "contextualMode": "NON_CONTEXTUAL", + "controlOk": "controlOk", + "controlCancel": "controlCancel", + "connectSignalOkSelected": "clicked", + "connectSignalCancelSelected": "clicked", + "animationMode": "CUSTOM", + "entryAnimation": { + "actor": "customAnimationPopup", "property": "position", "value": [ 0, 0, 0 ], - "alpha-function": "EASE_OUT", - "time-period": { + "alphaFunction": "EASE_OUT", + "timePeriod": { "delay": 0.0, "duration": 1.0 } }, - "exit-animation": { - "actor": "custom-animation-popup", + "exitAnimation": { + "actor": "customAnimationPopup", "property": "position", "value": [ -450, -225, 0 ], - "alpha-function": "EASE_IN", - "time-period": { + "alphaFunction": "EASE_IN", + "timePeriod": { "delay": 0.0, "duration": 1.0 } @@ -150,167 +150,167 @@ "title": { "type": "TextLabel", "text": "Title text", - "text-color": [1, 1, 1, 1] + "textColor": [1, 1, 1, 1] }, "content": { "type": "TextLabel", "text": "Content text", "padding": [20, 20, 20, 0], - "text-color": [1, 1, 1, 1] + "textColor": [1, 1, 1, 1] }, "footer": { "type": "Control", "size": [0, 80, 0], - "width-resize-policy": "FILL_TO_PARENT", - "height-resize-policy": "FIXED", - "parent-origin": "CENTER", - "anchor-point": "CENTER", + "widthResizePolicy": "FILL_TO_PARENT", + "heightResizePolicy": "FIXED", + "parentOrigin": "CENTER", + "anchorPoint": "CENTER", "actors": [ { "type": "PushButton", - "name": "control-ok", - "parent-origin": "CENTER_LEFT", - "anchor-point": "CENTER_LEFT", + "name": "controlOk", + "parentOrigin": "CENTER_LEFT", + "anchorPoint": "CENTER_LEFT", "position": [20, 0, 0], - "label-text": "OK" + "labelText": "OK" }, { "type": "PushButton", - "name": "control-cancel", - "parent-origin": "CENTER_RIGHT", - "anchor-point": "CENTER_RIGHT", + "name": "controlCancel", + "parentOrigin": "CENTER_RIGHT", + "anchorPoint": "CENTER_RIGHT", "position": [-20, 0, 0], - "label-text": "Cancel" + "labelText": "Cancel" } ] }, "signals": [ { - "name": "control-signal-ok", + "name": "controlSignalOk", "action": "set", - "actor": "selection-label", + "actor": "selectionLabel", "property": "text", "value": "User pressed: OK Button" }, { - "name": "control-signal-ok", + "name": "controlSignalOk", "action": "set", - "actor": "custom-animation-popup", - "property": "display-state", + "actor": "customAnimationPopup", + "property": "displayState", "value": "HIDDEN" }, { - "name": "control-signal-cancel", + "name": "controlSignalCancel", "action": "set", - "actor": "selection-label", + "actor": "selectionLabel", "property": "text", "value": "User pressed: Cancel Button" }, { - "name": "control-signal-cancel", + "name": "controlSignalCancel", "action": "set", - "actor": "custom-animation-popup", - "property": "display-state", + "actor": "customAnimationPopup", + "property": "displayState", "value": "HIDDEN" }, { - "name": "touched-outside", + "name": "touchedOutside", "action": "set", - "actor": "custom-animation-popup", - "property": "display-state", + "actor": "customAnimationPopup", + "property": "displayState", "value": "HIDDEN" }, { - "name": "touched-outside", + "name": "touchedOutside", "action": "set", - "actor": "selection-label", + "actor": "selectionLabel", "property": "text", "value": "No button pressed, backing touched" } ] }, { - "type": "popup-toast", + "type": "PopupToast", "name": "toast", - "width-resize-policy": "SIZE_RELATIVE_TO_PARENT", - "height-resize-policy": "USE_NATURAL_SIZE", - "size-mode-factor": [0.85, 0, 0], + "widthResizePolicy": "SIZE_RELATIVE_TO_PARENT", + "heightResizePolicy": "USE_NATURAL_SIZE", + "sizeModeFactor": [0.85, 0, 0], "title": { "type": "TextLabel", - "width-resize-policy": "FILL_TO_PARENT", - "height-resize-policy": "USE_NATURAL_SIZE", - "parent-origin": "CENTER", - "anchor-point": "CENTER", + "widthResizePolicy": "FILL_TO_PARENT", + "heightResizePolicy": "USE_NATURAL_SIZE", + "parentOrigin": "CENTER", + "anchorPoint": "CENTER", "text": "This is a toast popup. \nIt will auto-hide itself.", - "text-color": [1, 1, 1, 1], - "multi-line": true, - "horizontal-alignment": "CENTER", - "vertical-alignment": "CENTER", + "textColor": [1, 1, 1, 1], + "multiLine": true, + "horizontalAlignment": "CENTER", + "verticalAlignment": "CENTER", "padding": [20.0, 20.0, 20.0, 20.0] } }, { "type": "PushButton", - "name": "popup-trigger-button", - "parent-origin": [0.1, 0.1, 0.5], - "anchor-point": "TOP_LEFT", - "width-resize-policy": "SIZE_RELATIVE_TO_PARENT", - "height-resize-policy": "SIZE_RELATIVE_TO_PARENT", - "size-mode-factor": [0.38, 0.14, 1.0], - "label-text": "Popup", + "name": "popupTriggerButton", + "parentOrigin": [0.1, 0.1, 0.5], + "anchorPoint": "TOP_LEFT", + "widthResizePolicy": "SIZE_RELATIVE_TO_PARENT", + "heightResizePolicy": "SIZE_RELATIVE_TO_PARENT", + "sizeModeFactor": [0.38, 0.14, 1.0], + "labelText": "Popup", "signals": [{ "name": "clicked", "action": "set", - "actor": "confirmation-popup", - "property": "display-state", + "actor": "confirmationPopup", + "property": "displayState", "value": "SHOWN" }] }, { "type": "PushButton", - "name": "animated-popup-trigger-button", - "parent-origin": [0.9, 0.1, 0.5], - "anchor-point": "TOP_RIGHT", - "width-resize-policy": "SIZE_RELATIVE_TO_PARENT", - "height-resize-policy": "SIZE_RELATIVE_TO_PARENT", - "size-mode-factor": [0.38, 0.14, 1.0], - "label-text": "Animated", + "name": "animatedPopupTriggerButton", + "parentOrigin": [0.9, 0.1, 0.5], + "anchorPoint": "TOP_RIGHT", + "widthResizePolicy": "SIZE_RELATIVE_TO_PARENT", + "heightResizePolicy": "SIZE_RELATIVE_TO_PARENT", + "sizeModeFactor": [0.38, 0.14, 1.0], + "labelText": "Animated", "signals": [{ "name": "clicked", "action": "set", - "actor": "custom-animation-popup", - "property": "display-state", + "actor": "customAnimationPopup", + "property": "displayState", "value": "SHOWN" }] }, { "type": "PushButton", - "name": "toast-trigger-button", - "parent-origin": [0.5, 1.0, 0.5], - "anchor-point": "BOTTOM_CENTER", - "width-resize-policy": "SIZE_RELATIVE_TO_PARENT", - "height-resize-policy": "SIZE_RELATIVE_TO_PARENT", - "size-mode-factor": [0.5, 0.14, 1.0], - "label-text": "Push for Toast", + "name": "toastTriggerButton", + "parentOrigin": [0.5, 1.0, 0.5], + "anchorPoint": "BOTTOM_CENTER", + "widthResizePolicy": "SIZE_RELATIVE_TO_PARENT", + "heightResizePolicy": "SIZE_RELATIVE_TO_PARENT", + "sizeModeFactor": [0.5, 0.14, 1.0], + "labelText": "Push for Toast", "signals": [{ "name": "clicked", "action": "set", "actor": "toast", - "property": "display-state", + "property": "displayState", "value": "SHOWN" }] }, { "type": "TextLabel", - "name": "selection-label", - "parent-origin": [0.5, 0.22, 0.5], - "anchor-point": "TOP_CENTER", - "width-resize-policy": "SIZE_RELATIVE_TO_PARENT", - "height-resize-policy": "SIZE_RELATIVE_TO_PARENT", - "size-mode-factor": [0.9, 0.14, 1.0], + "name": "selectionLabel", + "parentOrigin": [0.5, 0.22, 0.5], + "anchorPoint": "TOP_CENTER", + "widthResizePolicy": "SIZE_RELATIVE_TO_PARENT", + "heightResizePolicy": "SIZE_RELATIVE_TO_PARENT", + "sizeModeFactor": [0.9, 0.14, 1.0], "text": "No selection made", - "horizontal-alignment": "CENTER", - "vertical-alignment": "CENTER" + "horizontalAlignment": "CENTER", + "verticalAlignment": "CENTER" } ] } diff --git a/resources/scripts/shader-effect-ripple.json b/resources/scripts/shader-effect-ripple.json index 82f8d23..648a913 100644 --- a/resources/scripts/shader-effect-ripple.json +++ b/resources/scripts/shader-effect-ripple.json @@ -8,19 +8,19 @@ 0.9150390625, 0.0 ], - "parent-origin": [0.5, 0.5, 0.5], + "parentOrigin": [0.5, 0.5, 0.5], "size": [200, 200, 0], "effect": "Ripple2D", "image": { "filename": "{DALI_IMAGE_DIR}gallery-medium-25.jpg", "width": 200, "height": 80, - "load-policy": "IMMEDIATE", - "release-policy": "NEVER" + "loadPolicy": "IMMEDIATE", + "releasePolicy": "NEVER" }, "signals": [ { - "name": "on-stage", + "name": "onStage", "action": "play", "animation": "Animation_1" } @@ -36,27 +36,27 @@ "actor": "Image1", "property": "uTime", "value": 10.0, - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0, "duration": 10.0 }, - "gui-builder-timeline-color": "#8dc0da" + "guiBuilderTimelineColor": "#8dc0da" } ] } }, - "shader-effects": { + "shaderEffects": { "Ripple2D": { "program": { "vertexPrefix": "", "vertex": "void main(void)\n{\n gl_Position = uProjection * uModelView * vec4(aPosition, 1.0);\n vTexCoord = aTexCoord;\n}\n\n", "fragmentPrefix": "", "fragment": "precision mediump float;\nuniform float uAmplitude; // 0.02; (< 1)\nuniform float uTime;\nvoid main()\n{\n highp vec2 textureSize = sTextureRect.zw - sTextureRect.xy;\n highp vec2 pos = -1.0 + 2.0 * vTexCoord.st/textureSize;\n highp float len = length(pos);\n highp vec2 texCoord = vTexCoord.st/textureSize + pos/len * sin( len * 12.0 - uTime * 4.0 ) * uAmplitude; \n gl_FragColor = texture2D(sTexture, texCoord) * uColor;\n}\n\n\n", - "geometry-type": "GEOMETRY_TYPE_IMAGE" + "geometryType": "GEOMETRY_TYPE_IMAGE" }, - "geometry-hints": "HINT_NONE", - "grid-density": 0, + "geometryHints": "HINT_NONE", + "gridDensity": 0, "loop": true, "uAmplitude": 0.02, "uTime": 0.0 diff --git a/resources/scripts/slider-test-style.json b/resources/scripts/slider-test-style.json index e08ceb0..84bc1c5 100644 --- a/resources/scripts/slider-test-style.json +++ b/resources/scripts/slider-test-style.json @@ -23,17 +23,17 @@ { "styles": { "slider": { - "anchor-point": [0.5, 0.0, 0.0], - "parent-origin": [0.5, 0.0, 0.0], + "anchorPoint": [0.5, 0.0, 0.0], + "parentOrigin": [0.5, 0.0, 0.0], "position": [0, 300, 0], "size": [480, 72, 1], - "lower-bound": 0, - "upper-bound": 10, - "show-popup": true, - "show-value": true, - "value-precision": 2, + "lowerBound": 0, + "upperBound": 10, + "showPopup": true, + "showValue": true, + "valuePrecision": 2, "value": 0.0, - "popup-text-color": [0.0, 1.0, 1.0, 1.0] + "popupTextColor": [0.0, 1.0, 1.0, 1.0] } } } diff --git a/resources/scripts/slider.json b/resources/scripts/slider.json index 8d4a4a7..a4e4755 100644 --- a/resources/scripts/slider.json +++ b/resources/scripts/slider.json @@ -17,115 +17,115 @@ { "stage": [{ "type": "Slider", - "parent-origin": "TOP_CENTER", + "parentOrigin": "TOP_CENTER", "position": [0, 144, 0], "size": [480, 72, 1], - "lower-bound": 0, - "upper-bound": 1, - "show-popup": true, - "show-value": true, - "value-precision": 2, + "lowerBound": 0, + "upperBound": 1, + "showPopup": true, + "showValue": true, + "valuePrecision": 2, "value": 0.0 }, { "type": "Slider", - "parent-origin": "TOP_CENTER", + "parentOrigin": "TOP_CENTER", "position": [0, 224, 0], "size": [300, 72, 1], - "lower-bound": 1, - "upper-bound": 10, - "show-popup": false, - "show-value": true, - "value-precision": 0, + "lowerBound": 1, + "upperBound": 10, + "showPopup": false, + "showValue": true, + "valuePrecision": 0, "value": 5.0 }, { "type": "Slider", - "parent-origin": "TOP_CENTER", + "parentOrigin": "TOP_CENTER", "position": [0, 304, 0], "size": [300, 72, 1], - "lower-bound": 0, - "upper-bound": 5, - "show-popup": false, - "show-value": false, + "lowerBound": 0, + "upperBound": 5, + "showPopup": false, + "showValue": false, "value": 0.0, - "mark-tolerance": 0.1, + "markTolerance": 0.1, "marks": [0, 1, 2, 3, 4, 5] }, { "type": "Slider", - "parent-origin": "TOP_CENTER", + "parentOrigin": "TOP_CENTER", "position": [0, 384, 0], "size": [480, 72, 1], - "lower-bound": 0, - "upper-bound": 5, - "show-popup": false, - "show-value": false, + "lowerBound": 0, + "upperBound": 5, + "showPopup": false, + "showValue": false, "value": 0.0, - "mark-tolerance": 0.1, - "snap-to-marks": true, + "markTolerance": 0.1, + "snapToMarks": true, "marks": [0, 1, 2, 3, 4, 5] }, { "type": "Slider", - "parent-origin": "TOP_CENTER", + "parentOrigin": "TOP_CENTER", "position": [0, 464, 0], "size": [480, 72, 1], - "lower-bound": 5, - "upper-bound": 100, - "show-popup": true, - "show-value": true, - "value-precision": 0, + "lowerBound": 5, + "upperBound": 100, + "showPopup": true, + "showValue": true, + "valuePrecision": 0, "value": 50.0, - "popup-text-color": [1, 0, 0, 1], - "hit-region": [0, 48], - "backing-region": [0, 10], - "handle-region": [48, 48] + "popupTextColor": [1, 0, 0, 1], + "hitRegion": [0, 48], + "backingRegion": [0, 10], + "handleRegion": [48, 48] }, { "type": "Slider", - "parent-origin": "TOP_CENTER", + "parentOrigin": "TOP_CENTER", "position": [0, 544, 0], "size": [480, 72, 1], - "lower-bound": 10, - "upper-bound": 100, - "show-popup": true, - "show-value": true, - "value-prescision": 0, + "lowerBound": 10, + "upperBound": 100, + "showPopup": true, + "showValue": true, + "valuePrescision": 0, "value": 100.0, - "hit-region": [0, 48], - "backing-region": [0, 10], - "handle-region": [48, 48], - "backing-image-name": "{DALI_IMAGE_DIR}circle_point_32x32.png", - "handle-image-name": "{DALI_IMAGE_DIR}circle_point_shadow_32x32.png", - "progress-image-name": "{DALI_IMAGE_DIR}circle_point.png", - "backing-scale9-border": [16, 0, 16, 0], - "progress-scale9-border": [16, 0, 16, 0] + "hitRegion": [0, 48], + "backingRegion": [0, 10], + "handleRegion": [48, 48], + "backingImageName": "{DALI_IMAGE_DIR}circle_point_32x32.png", + "handleImageName": "{DALI_IMAGE_DIR}circle_point_shadow_32x32.png", + "progressImageName": "{DALI_IMAGE_DIR}circle_point.png", + "backingScale9Border": [16, 0, 16, 0], + "progressScale9Border": [16, 0, 16, 0] }, { "type": "Slider", - "parent-origin": "TOP_CENTER", + "parentOrigin": "TOP_CENTER", "position": [0, 624, 0], "size": [480, 72, 1], - "lower-bound": 10, - "upper-bound": 100, - "show-popup": true, - "show-value": true, - "value-precision": 0, + "lowerBound": 10, + "upperBound": 100, + "showPopup": true, + "showValue": true, + "valuePrecision": 0, "value": 50.0, - "hit-region": [0, 48], - "backing-region": [0, 10], - "handle-region": [48, 48], + "hitRegion": [0, 48], + "backingRegion": [0, 10], + "handleRegion": [48, 48], "enabled": false }, { "type": "Slider", - "parent-origin": "TOP_CENTER", + "parentOrigin": "TOP_CENTER", "position": [0, 704, 0], "size": [480, 72, 1], - "lower-bound": 10, - "upper-bound": 100, - "show-popup": true, - "show-value": true, - "value-precision": 0, + "lowerBound": 10, + "upperBound": 100, + "showPopup": true, + "showValue": true, + "valuePrecision": 0, "value": 50.0, - "hit-region": [0, 48], - "backing-region": [0, 10], - "handle-region": [48, 48], + "hitRegion": [0, 48], + "backingRegion": [0, 10], + "handleRegion": [48, 48], "enabled": false, - "disable-color": [1, 0, 0, 1] + "disableColor": [1, 0, 0, 1] }] } diff --git a/resources/scripts/super-blur-view.json b/resources/scripts/super-blur-view.json index c786b47..bcdb61b 100644 --- a/resources/scripts/super-blur-view.json +++ b/resources/scripts/super-blur-view.json @@ -22,10 +22,10 @@ "blur": { "duration": 1, "properties": [{ - "actor": "super-blur", - "property": "blur-strength", + "actor": "superBlur", + "property": "blurStrength", "value": 1, - "time-period": { + "timePeriod": { "delay": 0, "duration": 1 } @@ -34,10 +34,10 @@ "clear": { "duration": 1, "properties": [{ - "actor": "super-blur", - "property": "blur-strength", + "actor": "superBlur", + "property": "blurStrength", "value": 0, - "time-period": { + "timePeriod": { "delay": 0, "duration": 1 } @@ -48,9 +48,9 @@ // SuperBlurView { "type": "SuperBlurView", - "name": "super-blur", - "parent-origin": "TOP_CENTER", - "anchor-point": "TOP_CENTER", + "name": "superBlur", + "parentOrigin": "TOP_CENTER", + "anchorPoint": "TOP_CENTER", "position": [0, 10, 0], "size": [460, 600, 0], "image": { @@ -61,17 +61,17 @@ // Button to blur/clear { "type": "PushButton", - "name": "toggle-button", - "parent-origin": "BOTTOM_CENTER", - "anchor-point": "BOTTOM_CENTER", + "name": "toggleButton", + "parentOrigin": "BOTTOM_CENTER", + "anchorPoint": "BOTTOM_CENTER", "position": [0, 0, 0], "size": [200, 100, 0], - "label-actor": { + "labelActor": { "type": "TextLabel", "text": "Blur" }, - "unselected-state-image": "{DALI_IMAGE_DIR}button-background.png", - "selected-state-image": "{DALI_IMAGE_DIR}button-background.png", + "unselectedStateImage": "{DALI_IMAGE_DIR}button-background.png", + "selectedStateImage": "{DALI_IMAGE_DIR}button-background.png", "signals": [{ "name": "pressed", "action": "play", diff --git a/resources/scripts/table-view.json b/resources/scripts/table-view.json index 54f16d8..81392c1 100644 --- a/resources/scripts/table-view.json +++ b/resources/scripts/table-view.json @@ -40,82 +40,82 @@ */ "stage": [{ - "name":"simple-table", + "name":"simpleTable", "type":"TableView", "background":{ "color": [0.5,0.5,0,1] }, - "parent-origin": "CENTER", + "parentOrigin": "CENTER", "size":[400,400,1], "rows": 4, "columns": 4, - "cell-padding": [10, 5], - "layout-rows": { // set the height of the rows + "cellPadding": [10, 5], + "layoutRows": { // set the height of the rows "0": { "policy": "fixed", "value": 40 }, "1": { "policy": "relative", "value": 0.33 }, "2": { "policy": "fit", "value": 0 } }, - "layout-columns": { // set the widths of the columns + "layoutColumns": { // set the widths of the columns "0": { "policy": "fit", "value": 0 }, "2": { "policy": "relative", "value": 0.2 }, "3": { "policy": "fixed", "value": 30 } }, "actors": [{ - "name":"gallery-1", + "name":"gallery1", "type":"ImageActor", - "height-resize-policy":"FILL_TO_PARENT", + "heightResizePolicy":"FILL_TO_PARENT", "image": { "filename": "{DALI_IMAGE_DIR}gallery-small-1.jpg" }, - "custom-properties": { // properties registered dynamically - "cell-index": [0,0], // property to specify the top-left cell this child occupies - "row-span":4, // property to specify how many rows this child occupies, if not set, default value is 1 - "column-span":1 // property to specify how many columns this child occupies, if nor set, defualt cvalue is 1 + "customProperties": { // properties registered dynamically + "cellIndex": [0,0], // property to specify the top-left cell this child occupies + "rowSpan":4, // property to specify how many rows this child occupies, if not set, default value is 1 + "columnSpan":1 // property to specify how many columns this child occupies, if nor set, defualt cvalue is 1 } },{ - "name":"gallery-2", + "name":"gallery2", "type":"ImageActor", - "height-resize-policy":"FILL_TO_PARENT", + "heightResizePolicy":"FILL_TO_PARENT", "image": { "filename": "{DALI_IMAGE_DIR}gallery-small-2.jpg" }, - "custom-properties": { // properties registered dynamically - "cell-index": [0,1], - "cell-horizontal-alignment": "right" // property to specify how to align horizontally inside the cells, if not set, default value is 'left' + "customProperties": { // properties registered dynamically + "cellIndex": [0,1], + "cellHorizontalAlignment": "right" // property to specify how to align horizontally inside the cells, if not set, default value is 'left' } },{ - "name":"gallery-3", + "name":"gallery3", "type":"ImageActor", "image": { "filename": "{DALI_IMAGE_DIR}gallery-small-3.jpg" }, - "custom-properties": { - "cell-index":[1,1], - "row-span":3, - "cell-horizontal-alignment": "left",// property to specify how to align horizontally inside the cells, if not set, default value is 'left' - "cell-vertical-alignment": "center" // property to specify how to align vertically inside the cells, if not set, default value is 'top' + "customProperties": { + "cellIndex":[1,1], + "rowSpan":3, + "cellHorizontalAlignment": "left",// property to specify how to align horizontally inside the cells, if not set, default value is 'left' + "cellVerticalAlignment": "center" // property to specify how to align vertically inside the cells, if not set, default value is 'top' } }, { - "name":"gallery-4", + "name":"gallery4", "type":"ImageActor", - "width-resize-policy":"FILL_TO_PARENT", + "widthResizePolicy":"FILL_TO_PARENT", "image": { "filename": "{DALI_IMAGE_DIR}gallery-small-4.jpg" }, - "custom-properties": { - "cell-index":[2,2] + "customProperties": { + "cellIndex":[2,2] } }, { - "name":"gallery-5", + "name":"gallery5", "type":"ImageActor", - "width-resize-policy":"FILL_TO_PARENT", - "height-resize-policy":"FILL_TO_PARENT", + "widthResizePolicy":"FILL_TO_PARENT", + "heightResizePolicy":"FILL_TO_PARENT", "image": { "filename": "{DALI_IMAGE_DIR}gallery-small-5.jpg" }, - "custom-properties": { - "cell-index":[3,2], - "column-span": 2 + "customProperties": { + "cellIndex":[3,2], + "columnSpan": 2 } }] }] diff --git a/resources/scripts/timing.json b/resources/scripts/timing.json index 72eaa57..e837b10 100644 --- a/resources/scripts/timing.json +++ b/resources/scripts/timing.json @@ -1,24 +1,24 @@ { "templates": { - "color-control": + "colorControl": { "type": "Control", - "parent-origin": "CENTER", - "anchor-point": "CENTER", + "parentOrigin": "CENTER", + "anchorPoint": "CENTER", "size": [ 100, 100, 1 ], "scale": [ 0.1, 0.1, 1 ], - "color-alpha": 0, + "colorAlpha": 0, "background":{ "color": [ 0.95, 0.65, 0.1, 1 ] } } }, "stage": [ { "type": "Actor", - "parent-origin": "CENTER", - "anchor-point": "CENTER", + "parentOrigin": "CENTER", + "anchorPoint": "CENTER", "actors": [{ - "type": "color-control", + "type": "colorControl", "name": "Container 1", "position": [ -165, @@ -27,7 +27,7 @@ ] }, { - "type": "color-control", + "type": "colorControl", "name": "Container 2", "position": [ -55, @@ -36,7 +36,7 @@ ] }, { - "type": "color-control", + "type": "colorControl", "name": "Container 3", "position": [ 55, @@ -45,7 +45,7 @@ ] }, { - "type": "color-control", + "type": "colorControl", "name": "Container 4", "position": [ 165, @@ -54,7 +54,7 @@ ] }, { - "type": "color-control", + "type": "colorControl", "name": "Container 5", "position": [ -165, @@ -63,7 +63,7 @@ ] }, { - "type": "color-control", + "type": "colorControl", "name": "Container 6", "position": [ -55, @@ -72,7 +72,7 @@ ] }, { - "type": "color-control", + "type": "colorControl", "name": "Container 7", "position": [ 55, @@ -81,7 +81,7 @@ ] }, { - "type": "color-control", + "type": "colorControl", "name": "Container 8", "position": [ 165, @@ -94,10 +94,10 @@ "type": "Control", "actors": [], "name": "ControlBack", - "parent-origin": "CENTER", - "anchor-point": "CENTER", - "width-resize-policy": "FILL_TO_PARENT", - "height-resize-policy": "FILL_TO_PARENT", + "parentOrigin": "CENTER", + "anchorPoint": "CENTER", + "widthResizePolicy": "FILL_TO_PARENT", + "heightResizePolicy": "FILL_TO_PARENT", "position": [ 0, 0, @@ -121,9 +121,9 @@ "type": "TextLabel", "text": "Touch", "name": "Instruction", - "parent-origin": "BOTTOM_CENTER", - "anchor-point": "BOTTOM_CENTER", - "text-color": [1, 0, 0, 1], + "parentOrigin": "BOTTOM_CENTER", + "anchorPoint": "BOTTOM_CENTER", + "textColor": [1, 0, 0, 1], "position": [ 0, 0, @@ -142,8 +142,8 @@ 1, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.35, "duration": 0.15 }, @@ -157,8 +157,8 @@ 0.10000000000000003, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 2.449, "duration": 0.15 }, @@ -166,10 +166,10 @@ }, { "actor": "Container 1", - "property": "color-alpha", + "property": "colorAlpha", "value": 1, - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.3, "duration": 0.05 }, @@ -177,10 +177,10 @@ }, { "actor": "Container 1", - "property": "color-alpha", + "property": "colorAlpha", "value": 0, - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 2.599, "duration": 0.051 }, @@ -194,8 +194,8 @@ 1, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.4, "duration": 0.15 }, @@ -209,8 +209,8 @@ 0.1, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 2.5, "duration": 0.15 }, @@ -218,10 +218,10 @@ }, { "actor": "Container 2", - "property": "color-alpha", + "property": "colorAlpha", "value": 1, - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.35, "duration": 0.05 }, @@ -229,10 +229,10 @@ }, { "actor": "Container 2", - "property": "color-alpha", + "property": "colorAlpha", "value": 0, - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 2.65, "duration": 0.05 }, @@ -246,8 +246,8 @@ 1, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.45, "duration": 0.15 }, @@ -261,8 +261,8 @@ 0.1, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 2.55, "duration": 0.15 }, @@ -270,10 +270,10 @@ }, { "actor": "Container 3", - "property": "color-alpha", + "property": "colorAlpha", "value": 1, - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.4, "duration": 0.05 }, @@ -281,10 +281,10 @@ }, { "actor": "Container 3", - "property": "color-alpha", + "property": "colorAlpha", "value": 0, - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 2.7, "duration": 0.05 }, @@ -298,8 +298,8 @@ 1, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.5, "duration": 0.15 }, @@ -313,8 +313,8 @@ 0.1, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 2.6, "duration": 0.15 }, @@ -322,10 +322,10 @@ }, { "actor": "Container 4", - "property": "color-alpha", + "property": "colorAlpha", "value": 1, - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.45, "duration": 0.05 }, @@ -333,10 +333,10 @@ }, { "actor": "Container 4", - "property": "color-alpha", + "property": "colorAlpha", "value": 0, - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 2.75, "duration": 0.05 }, @@ -350,8 +350,8 @@ 1, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.45, "duration": 0.15 }, @@ -365,8 +365,8 @@ 0.1, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 2.65, "duration": 0.15 }, @@ -374,10 +374,10 @@ }, { "actor": "Container 5", - "property": "color-alpha", + "property": "colorAlpha", "value": 1, - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.4, "duration": 0.05 }, @@ -385,10 +385,10 @@ }, { "actor": "Container 5", - "property": "color-alpha", + "property": "colorAlpha", "value": 0, - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 2.8, "duration": 0.05 }, @@ -402,8 +402,8 @@ 1, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.5, "duration": 0.15 }, @@ -417,8 +417,8 @@ 0.1, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 2.7, "duration": 0.15 }, @@ -426,10 +426,10 @@ }, { "actor": "Container 6", - "property": "color-alpha", + "property": "colorAlpha", "value": 1, - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.45, "duration": 0.05 }, @@ -437,10 +437,10 @@ }, { "actor": "Container 6", - "property": "color-alpha", + "property": "colorAlpha", "value": 0, - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 2.85, "duration": 0.05 }, @@ -454,8 +454,8 @@ 1, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.55, "duration": 0.15 }, @@ -469,8 +469,8 @@ 0.1, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 2.75, "duration": 0.15 }, @@ -478,10 +478,10 @@ }, { "actor": "Container 7", - "property": "color-alpha", + "property": "colorAlpha", "value": 1, - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.5, "duration": 0.05 }, @@ -489,10 +489,10 @@ }, { "actor": "Container 7", - "property": "color-alpha", + "property": "colorAlpha", "value": 0, - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 2.9, "duration": 0.05 }, @@ -506,8 +506,8 @@ 1, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.6, "duration": 0.15 }, @@ -521,8 +521,8 @@ 0.1, 1 ], - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 2.8, "duration": 0.15 }, @@ -530,10 +530,10 @@ }, { "actor": "Container 8", - "property": "color-alpha", + "property": "colorAlpha", "value": 1, - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 0.55, "duration": 0.05 }, @@ -541,10 +541,10 @@ }, { "actor": "Container 8", - "property": "color-alpha", + "property": "colorAlpha", "value": 0, - "alpha-function": "LINEAR", - "time-period": { + "alphaFunction": "LINEAR", + "timePeriod": { "delay": 2.95, "duration": 0.05 }, diff --git a/resources/style/demo-theme.json b/resources/style/demo-theme.json index 64fe786..b7d30ab 100644 --- a/resources/style/demo-theme.json +++ b/resources/style/demo-theme.json @@ -24,53 +24,53 @@ distributing this software or its derivatives. { "textlabel-Rosemary": { - "font-family":"Rosemary" + "fontFamily":"Rosemary" }, "textlabel": { - "font-style":"Regular", - "point-size":18 + "fontStyle":"Regular", + "pointSize":18 }, "launcherlabel": { - "point-size":18 + "pointSize":18 }, "toolbarlabel": { - "point-size":18 + "pointSize":18 }, "builderlabel": { - "point-size":13 + "pointSize":13 }, "scrollview": { - "overshoot-effect-color":"B018" + "overshootEffectColor":"B018" }, "grouplabel": { - "point-size":9 + "pointSize":9 }, "buttonlabel": { - "point-size":11 + "pointSize":11 }, "launcherbackground": { "background": { - "renderer-type": "gradient-renderer", - "gradient-center": [240, 400], - "gradient-radius": 932, - "gradient-units": "user-space", - "gradient-stop-color": [[0.247,0.38,0.52,1.0],[0.055,0.18,0.286,1.0]], - "gradient-stop-offset":[0.0,1.0] + "rendererType": "gradientRenderer", + "gradientCenter": [240, 400], + "gradientRadius": 932, + "gradientUnits": "userSpace", + "gradientStopColor": [[0.247,0.38,0.52,1.0],[0.055,0.18,0.286,1.0]], + "gradientStopOffset":[0.0,1.0] } } } diff --git a/resources/style/mobile/demo-theme.json b/resources/style/mobile/demo-theme.json index 653fbea..ce18131 100644 --- a/resources/style/mobile/demo-theme.json +++ b/resources/style/mobile/demo-theme.json @@ -24,74 +24,74 @@ distributing this software or its derivatives. { "textlabel-Rosemary": { - "font-family":"Rosemary" + "fontFamily":"Rosemary" }, "textlabel": { - "font-style":"Regular", - "point-size":18 + "fontStyle":"Regular", + "pointSize":18 }, - "textlabel-font-size-0": + "textlabelFontSize0": { - "point-size":8 + "pointSize":8 }, - "textlabel-font-size-1": + "textlabelFontSize1": { - "point-size":10 + "pointSize":10 }, - "textlabel-font-size-2": + "textlabelFontSize2": { - "point-size":15 + "pointSize":15 }, - "textlabel-font-size-3": + "textlabelFontSize3": { - "point-size":19 + "pointSize":19 }, - "textlabel-font-size-4": + "textlabelFontSize4": { - "point-size":25 + "pointSize":25 }, "launcherlabel": { - "point-size":8 + "pointSize":8 }, "toolbarlabel": { - "point-size":10 + "pointSize":10 }, "builderlabel": { - "point-size":10 + "pointSize":10 }, "scrollview": { - "overshoot-effect-color":"B018" + "overshootEffectColor":"B018" }, "grouplabel": { - "point-size":6 + "pointSize":6 }, "buttonlabel": { - "point-size":8 + "pointSize":8 }, "launcherbackground": { "background": { - "renderer-type": "gradient-renderer", - "gradient-center": [360, 640], - "gradient-radius": 1468, - "gradient-units": "user-space", - "gradient-stop-color": [[0.247,0.38,0.52,1.0],[0.055,0.18,0.286,1.0]], - "gradient-stop-offset":[0.0,1.0] + "rendererType": "gradientRenderer", + "gradientCenter": [360, 640], + "gradientRadius": 1468, + "gradientUnits": "userSpace", + "gradientStopColor": [[0.247,0.38,0.52,1.0],[0.055,0.18,0.286,1.0]], + "gradientStopOffset":[0.0,1.0] } } } -- libgit2 0.21.4