Changes following the property & singal name changes 36/50836/4
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Mon, 2 Nov 2015 18:40:44 +0000 (18:40 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Tue, 3 Nov 2015 16:55:09 +0000 (16:55 +0000)
Change-Id: I5d09c3ba92dca882a6ae3e1765cb105ddad66bec

34 files changed:
builder/dali-builder.cpp
demo/dali-table-view.cpp
examples/blocks/blocks-example.cpp
examples/builder/examples.cpp
examples/buttons/buttons-example.cpp
examples/gradients/gradients-example.cpp
examples/hello-world/hello-world-example.cpp
examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
examples/magnifier/magnifier-example.cpp
examples/model3d-view/model3d-view-example.cpp
examples/new-window/new-window-example.cpp
examples/popup/popup-example.cpp
examples/text-field/text-field-example.cpp
examples/text-message-field/text-message-field-example.cpp
examples/textured-mesh/textured-mesh-example.cpp
resources/scripts/animated-buttons.json
resources/scripts/animated-colors.json
resources/scripts/animation.json
resources/scripts/background-color.json
resources/scripts/button.json
resources/scripts/choreography.json
resources/scripts/contacts.json
resources/scripts/gallery.json
resources/scripts/hello-world.json
resources/scripts/music-library.json
resources/scripts/popup.json
resources/scripts/shader-effect-ripple.json
resources/scripts/slider-test-style.json
resources/scripts/slider.json
resources/scripts/super-blur-view.json
resources/scripts/table-view.json
resources/scripts/timing.json
resources/style/demo-theme.json
resources/style/mobile/demo-theme.json

index d423d85..0a693a7 100644 (file)
@@ -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'                        \
     }                                                          \
   ]                                                            \
index 727140f..44eeea8 100644 (file)
@@ -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 ) );
index 0da125b..d61b86d 100644 (file)
@@ -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.
index f302d9f..2402e42 100644 (file)
@@ -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'                        \
     }                                                          \
   ]                                                            \
index 842bfa3..11979db 100644 (file)
@@ -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 );
 
index 6ea9b15..ca2b579 100644 (file)
@@ -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;
       }
     }
index 3a944fa..f316b2c 100644 (file)
@@ -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
index eb70bc8..4fcd0a1 100644 (file)
@@ -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 );
index 8f0945d..f781d70 100644 (file)
@@ -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.
index ee4112c..fc056b5 100644 (file)
@@ -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);
 
index c553b6c..f494b9b 100644 (file)
@@ -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;
index ea2e89a..9d83606 100644 (file)
@@ -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();
index 9b4a5f4..0f12e4d 100644 (file)
@@ -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 );
index 0189334..4e337b5 100644 (file)
@@ -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");
index 2271dda..3af6740 100644 (file)
@@ -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);
 
index 8bf6055..f7e2a8e 100644 (file)
@@ -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,
         "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": []
     {
       "type": "ImageActor",
       "name": "Middle",
-      "relayout-enabled": false,
+      "relayoutEnabled": false,
       "position": [
         375.5,
         214.5,
         0
       ],
-      "anchor-point": [
+      "anchorPoint": [
         0,
         0.5,
         0.5
         "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": []
     {
       "type": "ImageActor",
       "name": "Jelly",
-      "relayout-enabled": false,
+      "relayoutEnabled": false,
       "position": [
         374,
         215,
         "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": []
     {
       "type": "Control",
       "name": "Left Crop",
-      "relayout-enabled": false,
+      "relayoutEnabled": false,
       "position": [
         144.5,
         218.5,
     {
       "type": "Control",
       "name": "Right Crop",
-      "relayout-enabled": false,
+      "relayoutEnabled": false,
       "position": [
         629.5,
         218.5,
     {
       "type": "ImageActor",
       "name": "JellyOff",
-      "relayout-enabled": false,
+      "relayoutEnabled": false,
       "position": [
         121,
         -117,
         "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": []
     {
       "type": "Control",
       "name": "Control On",
-      "relayout-enabled": false,
+      "relayoutEnabled": false,
       "position": [
         371.26116838487997,
         217.33333333333331,
     {
       "type": "Control",
       "name": "Control Off",
-      "relayout-enabled": false,
+      "relayoutEnabled": false,
       "position": [
         123.5,
         -117,
             214.5,
             0
           ],
-          "alpha-function": "EASE_OUT",
-          "time-period": {
+          "alphaFunction": "EASE_OUT",
+          "timePeriod": {
             "delay": 3.106,
             "duration": 1.465
           },
             214.5,
             0
           ],
-          "alpha-function": "EASE_OUT",
-          "time-period": {
+          "alphaFunction": "EASE_OUT",
+          "timePeriod": {
             "delay": 3.106,
             "duration": 1.465
           },
             161,
             1
           ],
-          "alpha-function": "EASE_OUT",
-          "time-period": {
+          "alphaFunction": "EASE_OUT",
+          "timePeriod": {
             "delay": 0,
             "duration": 1.27
           },
             161,
             1
           ],
-          "alpha-function": "EASE_OUT",
-          "time-period": {
+          "alphaFunction": "EASE_OUT",
+          "timePeriod": {
             "delay": 3.127,
             "duration": 1.44
           },
             215,
             0
           ],
-          "alpha-function": "EASE_OUT",
-          "time-period": {
+          "alphaFunction": "EASE_OUT",
+          "timePeriod": {
             "delay": 1.486,
             "duration": 1.29
           },
             218.5,
             0.5
           ],
-          "alpha-function": "EASE_OUT",
-          "time-period": {
+          "alphaFunction": "EASE_OUT",
+          "timePeriod": {
             "delay": 3.106,
             "duration": 1.47
           },
             214.5,
             0
           ],
-          "alpha-function": "EASE_OUT",
-          "time-period": {
+          "alphaFunction": "EASE_OUT",
+          "timePeriod": {
             "delay": 0,
             "duration": 1.27
           },
             218.5,
             0.5
           ],
-          "alpha-function": "EASE_OUT",
-          "time-period": {
+          "alphaFunction": "EASE_OUT",
+          "timePeriod": {
             "delay": 0,
             "duration": 1.276
           },
             217.33333333333331,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 2.765,
             "duration": 0.001
           },
             -117,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0,
             "duration": 0.001
           },
             215,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 2.765,
             "duration": 0.001
           },
             -117,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 2.765,
             "duration": 0.001
           },
             -117,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0,
             "duration": 0.001
           },
             214.5,
             0
           ],
-          "alpha-function": "EASE_OUT",
-          "time-period": {
+          "alphaFunction": "EASE_OUT",
+          "timePeriod": {
             "delay": 0,
             "duration": 1.27
           },
             214.5,
             0
           ],
-          "alpha-function": "EASE_OUT",
-          "time-period": {
+          "alphaFunction": "EASE_OUT",
+          "timePeriod": {
             "delay": 0,
             "duration": 1.27
           },
             161,
             1
           ],
-          "alpha-function": "EASE_OUT",
-          "time-period": {
+          "alphaFunction": "EASE_OUT",
+          "timePeriod": {
             "delay": 0,
             "duration": 1.27
           },
             161,
             1
           ],
-          "alpha-function": "EASE_OUT",
-          "time-period": {
+          "alphaFunction": "EASE_OUT",
+          "timePeriod": {
             "delay": 3.127,
             "duration": 1.44
           },
             215,
             0
           ],
-          "alpha-function": "EASE_OUT",
-          "time-period": {
+          "alphaFunction": "EASE_OUT",
+          "timePeriod": {
             "delay": 1.486,
             "duration": 1.29
           },
             219,
             0
           ],
-          "alpha-function": "EASE_OUT",
-          "time-period": {
+          "alphaFunction": "EASE_OUT",
+          "timePeriod": {
             "delay": 0,
             "duration": 1.276
           },
             214.5,
             0.5
           ],
-          "alpha-function": "EASE_OUT",
-          "time-period": {
+          "alphaFunction": "EASE_OUT",
+          "timePeriod": {
             "delay": 3.106,
             "duration": 1.465
           },
             218.5,
             0.5
           ],
-          "alpha-function": "EASE_OUT",
-          "time-period": {
+          "alphaFunction": "EASE_OUT",
+          "timePeriod": {
             "delay": 3.106,
             "duration": 1.47
           },
             -131,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0,
             "duration": 0.001
           },
             215,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 2.765,
             "duration": 0.001
           },
             -117,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 2.765,
             "duration": 0.001
           },
             215,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 2.765,
             "duration": 0.001
           },
index 517c5af..53df15b 100644 (file)
             0,
             0
           ],
-          "inherit-position": true,
-          "parent-origin": [
+          "inheritPosition": true,
+          "parentOrigin": [
             0,
             0.5,
             0.5
           ],
-          "anchor-point": [
+          "anchorPoint": [
             1,
             0.5,
             0.5
                 0,
                 0
               ],
-              "inherit-position": true,
-              "parent-origin": [
+              "inheritPosition": true,
+              "parentOrigin": [
                 0,
                 0.5,
                 0.5
               ],
-              "anchor-point": [
+              "anchorPoint": [
                 1,
                 0.5,
                 0.5
                     0,
                     0
                   ],
-                  "inherit-position": true,
-                  "parent-origin": [
+                  "inheritPosition": true,
+                  "parentOrigin": [
                     1,
                     0.5,
                     0.5
                   ],
-                  "anchor-point": [
+                  "anchorPoint": [
                     0,
                     0.5,
                     0.5
                 0,
                 0
               ],
-              "inherit-position": true,
-              "parent-origin": [
+              "inheritPosition": true,
+              "parentOrigin": [
                 1,
                 0.5,
                 0.5
               ],
-              "anchor-point": [
+              "anchorPoint": [
                 0,
                 0.5,
                 0.5
                     0,
                     0
                   ],
-                  "inherit-position": true,
-                  "parent-origin": [
+                  "inheritPosition": true,
+                  "parentOrigin": [
                     0,
                     0.5,
                     0.5
                   ],
-                  "anchor-point": [
+                  "anchorPoint": [
                     1,
                     0.5,
                     0.5
                         0,
                         0
                       ],
-                      "inherit-position": true,
-                      "parent-origin": [
+                      "inheritPosition": true,
+                      "parentOrigin": [
                         1,
                         0.5,
                         0.5
                       ],
-                      "anchor-point": [
+                      "anchorPoint": [
                         0,
                         0.5,
                         0.5
                     0,
                     0
                   ],
-                  "inherit-position": true,
-                  "parent-origin": [
+                  "inheritPosition": true,
+                  "parentOrigin": [
                     1,
                     0.5,
                     0.5
                   ],
-                  "anchor-point": [
+                  "anchorPoint": [
                     0,
                     0.5,
                     0.5
                         0,
                         0
                       ],
-                      "inherit-position": true,
-                      "parent-origin": [
+                      "inheritPosition": true,
+                      "parentOrigin": [
                         0,
                         0.5,
                         0.5
                       ],
-                      "anchor-point": [
+                      "anchorPoint": [
                         1,
                         0.5,
                         0.5
                             0,
                             0
                           ],
-                          "inherit-position": true,
-                          "parent-origin": [
+                          "inheritPosition": true,
+                          "parentOrigin": [
                             1,
                             0.5,
                             0.5
                           ],
-                          "anchor-point": [
+                          "anchorPoint": [
                             0,
                             0.5,
                             0.5
                         0,
                         0
                       ],
-                      "inherit-position": true,
-                      "parent-origin": [
+                      "inheritPosition": true,
+                      "parentOrigin": [
                         1,
                         0.5,
                         0.5
                       ],
-                      "anchor-point": [
+                      "anchorPoint": [
                         0,
                         0.5,
                         0.5
                     0,
                     0
                   ],
-                  "inherit-position": true,
-                  "parent-origin": [
+                  "inheritPosition": true,
+                  "parentOrigin": [
                     0.5,
                     1,
                     0.5
                   ],
-                  "anchor-point": [
+                  "anchorPoint": [
                     0.5,
                     0,
                     0.5
                 0,
                 0
               ],
-              "inherit-position": true,
-              "parent-origin": [
+              "inheritPosition": true,
+              "parentOrigin": [
                 0.5,
                 1,
                 0.5
               ],
-              "anchor-point": [
+              "anchorPoint": [
                 0.5,
                 0,
                 0.5
             0,
             0
           ],
-          "inherit-position": true,
-          "parent-origin": [
+          "inheritPosition": true,
+          "parentOrigin": [
             0.5,
             1,
             0.5
           ],
-          "anchor-point": [
+          "anchorPoint": [
             0.5,
             0,
             0.5
                 0,
                 0
               ],
-              "inherit-position": true,
-              "parent-origin": [
+              "inheritPosition": true,
+              "parentOrigin": [
                 1,
                 0.5,
                 0.5
               ],
-              "anchor-point": [
+              "anchorPoint": [
                 0,
                 0.5,
                 0.5
             0,
             0
           ],
-          "inherit-position": true,
-          "parent-origin": [
+          "inheritPosition": true,
+          "parentOrigin": [
             1,
             0.5,
             0.5
           ],
-          "anchor-point": [
+          "anchorPoint": [
             0,
             0.5,
             0.5
                     0,
                     0
                   ],
-                  "inherit-position": true,
-                  "parent-origin": [
+                  "inheritPosition": true,
+                  "parentOrigin": [
                     1,
                     0.5,
                     0.5
                   ],
-                  "anchor-point": [
+                  "anchorPoint": [
                     0,
                     0.5,
                     0.5
                 0,
                 0
               ],
-              "inherit-position": true,
-              "parent-origin": [
+              "inheritPosition": true,
+              "parentOrigin": [
                 1,
                 0.5,
                 0.5
               ],
-              "anchor-point": [
+              "anchorPoint": [
                 0,
                 0.5,
                 0.5
                 0,
                 0
               ],
-              "inherit-position": true,
-              "parent-origin": [
+              "inheritPosition": true,
+              "parentOrigin": [
                 0,
                 0.5,
                 0.5
               ],
-              "anchor-point": [
+              "anchorPoint": [
                 1,
                 0.5,
                 0.5
                         0,
                         0
                       ],
-                      "inherit-position": true,
-                      "parent-origin": [
+                      "inheritPosition": true,
+                      "parentOrigin": [
                         1,
                         0.5,
                         0.5
                       ],
-                      "anchor-point": [
+                      "anchorPoint": [
                         0,
                         0.5,
                         0.5
                     0,
                     0
                   ],
-                  "inherit-position": true,
-                  "parent-origin": [
+                  "inheritPosition": true,
+                  "parentOrigin": [
                     1,
                     0.5,
                     0.5
                   ],
-                  "anchor-point": [
+                  "anchorPoint": [
                     0,
                     0.5,
                     0.5
                     0,
                     0
                   ],
-                  "inherit-position": true,
-                  "parent-origin": [
+                  "inheritPosition": true,
+                  "parentOrigin": [
                     0,
                     0.5,
                     0.5
                   ],
-                  "anchor-point": [
+                  "anchorPoint": [
                     1,
                     0.5,
                     0.5
                 0,
                 0
               ],
-              "inherit-position": true,
-              "parent-origin": [
+              "inheritPosition": true,
+              "parentOrigin": [
                 0.5,
                 0,
                 0.5
               ],
-              "anchor-point": [
+              "anchorPoint": [
                 0.5,
                 1,
                 0.5
             0,
             0
           ],
-          "inherit-position": true,
-          "parent-origin": [
+          "inheritPosition": true,
+          "parentOrigin": [
             0.5,
             0,
             0.5
           ],
-          "anchor-point": [
+          "anchorPoint": [
             0.5,
             1,
             0.5
             {
       "type": "TextLabel",
       "name": "text",
-      "parent-origin": "CENTER",
-      "anchor-point": "CENTER",
+      "parentOrigin": "CENTER",
+      "anchorPoint": "CENTER",
       "text": "START",
-      "point-size": 20,
+      "pointSize": 20,
       "signals": [
         {
           "name": "tapped",
         0,
         0
       ],
-      "inherit-position": true,
-      "parent-origin": [
+      "inheritPosition": true,
+      "parentOrigin": [
         0.5,
         0.5,
         0.5
       ],
-      "anchor-point": [
+      "anchorPoint": [
         1,
         1,
         0.5
             0,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0,
             "duration": 0.2
           },
             0.32941176470588235,
             1
           ],
-          "alpha-function": "SIN",
-          "time-period": {
+          "alphaFunction": "SIN",
+          "timePeriod": {
             "delay": 0,
             "duration": 2
           },
             0.9098039215686274,
             1
           ],
-          "alpha-function": "SIN",
-          "time-period": {
+          "alphaFunction": "SIN",
+          "timePeriod": {
             "delay": 0,
             "duration": 2
           },
             0.4235294117647059,
             1
           ],
-          "alpha-function": "SIN",
-          "time-period": {
+          "alphaFunction": "SIN",
+          "timePeriod": {
             "delay": 0,
             "duration": 2
           },
             0.027450980392156862,
             1
           ],
-          "alpha-function": "SIN",
-          "time-period": {
+          "alphaFunction": "SIN",
+          "timePeriod": {
             "delay": 0,
             "duration": 2
           },
             0.8627450980392157,
             1
           ],
-          "alpha-function": "SIN",
-          "time-period": {
+          "alphaFunction": "SIN",
+          "timePeriod": {
             "delay": 0,
             "duration": 2
           },
             0.1803921568627451,
             1
           ],
-          "alpha-function": "SIN",
-          "time-period": {
+          "alphaFunction": "SIN",
+          "timePeriod": {
             "delay": 0,
             "duration": 2
           },
             0.5333333333333333,
             1
           ],
-          "alpha-function": "SIN",
-          "time-period": {
+          "alphaFunction": "SIN",
+          "timePeriod": {
             "delay": 0,
             "duration": 2
           },
             0,
             1
           ],
-          "alpha-function": "SIN",
-          "time-period": {
+          "alphaFunction": "SIN",
+          "timePeriod": {
             "delay": 0,
             "duration": 2
           },
             1,
             1
           ],
-          "alpha-function": "SIN",
-          "time-period": {
+          "alphaFunction": "SIN",
+          "timePeriod": {
             "delay": 0,
             "duration": 2
           },
             0.06666666666666667,
             1
           ],
-          "alpha-function": "SIN",
-          "time-period": {
+          "alphaFunction": "SIN",
+          "timePeriod": {
             "delay": 0,
             "duration": 2
           },
             0,
             1
           ],
-          "alpha-function": "SIN",
-          "time-period": {
+          "alphaFunction": "SIN",
+          "timePeriod": {
             "delay": 0,
             "duration": 2
           },
             0.788235294117647,
             1
           ],
-          "alpha-function": "SIN",
-          "time-period": {
+          "alphaFunction": "SIN",
+          "timePeriod": {
             "delay": 0,
             "duration": 2
           },
             0.7294117647058823,
             1
           ],
-          "alpha-function": "SIN",
-          "time-period": {
+          "alphaFunction": "SIN",
+          "timePeriod": {
             "delay": 0.001,
             "duration": 2
           },
             1,
             1
           ],
-          "alpha-function": "SIN",
-          "time-period": {
+          "alphaFunction": "SIN",
+          "timePeriod": {
             "delay": 0,
             "duration": 2
           },
             0,
             1
           ],
-          "alpha-function": "SIN",
-          "time-period": {
+          "alphaFunction": "SIN",
+          "timePeriod": {
             "delay": 0,
             "duration": 2
           },
             0.5607843137254902,
             1
           ],
-          "alpha-function": "SIN",
-          "time-period": {
+          "alphaFunction": "SIN",
+          "timePeriod": {
             "delay": 0,
             "duration": 2
           },
             1,
             1
           ],
-          "alpha-function": "SIN",
-          "time-period": {
+          "alphaFunction": "SIN",
+          "timePeriod": {
             "delay": 0,
             "duration": 2
           },
             0,
             1
           ],
-          "alpha-function": "SIN",
-          "time-period": {
+          "alphaFunction": "SIN",
+          "timePeriod": {
             "delay": 0.001,
             "duration": 2
           },
             0.24313725490196078,
             1
           ],
-          "alpha-function": "SIN",
-          "time-period": {
+          "alphaFunction": "SIN",
+          "timePeriod": {
             "delay": 0,
             "duration": 2
           },
             0.43137254901960786,
             1
           ],
-          "alpha-function": "SIN",
-          "time-period": {
+          "alphaFunction": "SIN",
+          "timePeriod": {
             "delay": 0,
             "duration": 2
           },
             0,
             1
           ],
-          "alpha-function": "SIN",
-          "time-period": {
+          "alphaFunction": "SIN",
+          "timePeriod": {
             "delay": 0,
             "duration": 2
           },
             1,
             1
           ],
-          "alpha-function": "SIN",
-          "time-period": {
+          "alphaFunction": "SIN",
+          "timePeriod": {
             "delay": 0,
             "duration": 2
           },
             0.6784313725490196,
             1
           ],
-          "alpha-function": "SIN",
-          "time-period": {
+          "alphaFunction": "SIN",
+          "timePeriod": {
             "delay": 0,
             "duration": 2
           },
             0.4196078431372549,
             1
           ],
-          "alpha-function": "SIN",
-          "time-period": {
+          "alphaFunction": "SIN",
+          "timePeriod": {
             "delay": 0,
             "duration": 2
           },
index 0383037..624d285 100644 (file)
 {
   // 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
         }
         "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],
     "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.."
   }, {
     "image": {
       "filename": "{DALI_IMAGE_DIR}gallery-large-21.jpg"
     },
-    "relayout-enabled": false,
+    "relayoutEnabled": false,
     "position": [0, 200, 0],
     "size": [200, 200, 1],
     "signals": [{
       "action": "play",
       "animation": "rotate"
     }],
-    "position-inheritance": "DONT_INHERIT_POSITION"
+    "positionInheritance": "DONT_INHERIT_POSITION"
   }]
 }
index f383657..f8ad659 100644 (file)
     // 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"
index 481d11d..1541aff 100644 (file)
     // 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"
index 322ffc4..b57baa4 100644 (file)
@@ -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,
       ],
       "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,
       ]
     },
     {
-      "type": "rectangle-control",
+      "type": "rectangleControl",
       "name": "Rect2",
       "position": [
         120,
       ]
     },
     {
-      "type": "rectangle-control",
+      "type": "rectangleControl",
       "name": "Rect3",
       "position": [
         190,
       ]
     },
     {
-      "type": "rectangle-control",
+      "type": "rectangleControl",
       "name": "Rect4",
       "position": [
         260,
             198,
             -1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0,
             "duration": 0.025
           },
             190,
             -1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0,
             "duration": 0.05
           },
             170,
             -1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.05,
             "duration": 0.05
           },
             150,
             -1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.1,
             "duration": 0.051
           },
             125,
             -1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.151,
             "duration": 0.049
           },
             100,
             -1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.2,
             "duration": 0.051
           },
             70,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0,
             "duration": 0.025
           },
             20,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.151,
             "duration": 0.1
           },
             1,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0,
             "duration": 0.025
           },
             0.1,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0,
             "duration": 0.325
           },
             1,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0,
             "duration": 0.025
           },
             0.1,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.049,
             "duration": 0.301
           },
             1,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0,
             "duration": 0.025
           },
             0.1,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.1,
             "duration": 0.272
           },
             20,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0,
             "duration": 0.025
           },
             210,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.227,
             "duration": 0.122
           },
         },
         {
           "actor": "topContainer",
-          "property": "color-alpha",
+          "property": "colorAlpha",
           "value": 0,
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0,
             "duration": 0.025
           },
         },
         {
           "actor": "topContainer",
-          "property": "color-alpha",
+          "property": "colorAlpha",
           "value": 1,
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.101,
             "duration": 0.249
           },
             280,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.1,
             "duration": 0.075
           },
             260,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.175,
             "duration": 0.075
           },
             250,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.25,
             "duration": 0.075
           },
         },
         {
           "actor": "Rect1",
-          "property": "color-alpha",
+          "property": "colorAlpha",
           "value": 0,
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0,
             "duration": 0.025
           },
         },
         {
           "actor": "Rect1",
-          "property": "color-alpha",
+          "property": "colorAlpha",
           "value": 1,
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0,
             "duration": 0.325
           },
             280,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.148,
             "duration": 0.077
           },
             260,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.225,
             "duration": 0.075
           },
             250,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.3,
             "duration": 0.072
           },
         },
         {
           "actor": "Rect2",
-          "property": "color-alpha",
+          "property": "colorAlpha",
           "value": 0,
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0,
             "duration": 0.025
           },
         },
         {
           "actor": "Rect2",
-          "property": "color-alpha",
+          "property": "colorAlpha",
           "value": 1,
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.05,
             "duration": 0.322
           },
             280,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.2,
             "duration": 0.074
           },
             260,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.274,
             "duration": 0.073
           },
             250,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.347,
             "duration": 0.078
           },
         },
         {
           "actor": "Rect3",
-          "property": "color-alpha",
+          "property": "colorAlpha",
           "value": 0,
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0,
             "duration": 0.025
           },
         },
         {
           "actor": "Rect3",
-          "property": "color-alpha",
+          "property": "colorAlpha",
           "value": 1,
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.099,
             "duration": 0.326
           },
             280,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.251,
             "duration": 0.075
           },
             260,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.326,
             "duration": 0.074
           },
             250,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.4,
             "duration": 0.075
           },
         },
         {
           "actor": "Rect4",
-          "property": "color-alpha",
+          "property": "colorAlpha",
           "value": 0,
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0,
             "duration": 0.025
           },
         },
         {
           "actor": "Rect4",
-          "property": "color-alpha",
+          "property": "colorAlpha",
           "value": 1,
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.148,
             "duration": 0.327
           },
index 267f8fd..723008b 100644 (file)
@@ -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,
         "filename": "{DALI_IMAGE_DIR}contacts-image.png",
         "width": 53,
         "height": 52,
-        "load-policy": "IMMEDIATE",
-        "release-policy": "NEVER"
+        "loadPolicy": "IMMEDIATE",
+        "releasePolicy": "NEVER"
       }
     },
     {
         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,
         611.5127067356418,
         1
       ],
-      "inherit-position": true,
+      "inheritPosition": true,
       "size": [
         80,
         71,
         "filename": "{DALI_IMAGE_DIR}contacts-add.png",
         "width": 80,
         "height": 71,
-        "load-policy": "IMMEDIATE",
-        "release-policy": "NEVER"
+        "loadPolicy": "IMMEDIATE",
+        "releasePolicy": "NEVER"
       }
     },
     {
         677.5051724136168,
         0
       ],
-      "inherit-position": true,
+      "inheritPosition": true,
       "size": [
         360,
         77,
         "filename": "{DALI_IMAGE_DIR}contacts-messenger.png",
         "width": 360,
         "height": 77,
-        "load-policy": "IMMEDIATE",
-        "release-policy": "NEVER"
+        "loadPolicy": "IMMEDIATE",
+        "releasePolicy": "NEVER"
       }
     },
     {
         704.5075140543304,
         0
       ],
-      "inherit-position": true,
+      "inheritPosition": true,
       "size": [
         360,
         79,
         "filename": "{DALI_IMAGE_DIR}contacts-email.png",
         "width": 360,
         "height": 79,
-        "load-policy": "IMMEDIATE",
-        "release-policy": "NEVER"
+        "loadPolicy": "IMMEDIATE",
+        "releasePolicy": "NEVER"
       }
     },
     {
         727.0088875903122,
         0
       ],
-      "inherit-position": true,
+      "inheritPosition": true,
       "size": [
         360,
         80,
         "filename": "{DALI_IMAGE_DIR}contacts-mobile.png",
         "width": 360,
         "height": 80,
-        "load-policy": "IMMEDIATE",
-        "release-policy": "NEVER"
+        "loadPolicy": "IMMEDIATE",
+        "releasePolicy": "NEVER"
       }
     },
     {
         749.5101801844454,
         0
       ],
-      "inherit-position": true,
+      "inheritPosition": true,
       "size": [
         360,
         75,
         "filename": "{DALI_IMAGE_DIR}contacts-home.png",
         "width": 360,
         "height": 75,
-        "load-policy": "IMMEDIATE",
-        "release-policy": "NEVER"
+        "loadPolicy": "IMMEDIATE",
+        "releasePolicy": "NEVER"
       }
     },
     {
         50.289953613295076,
         1
       ],
-      "inherit-position": true,
+      "inheritPosition": true,
       "size": [
         25,
         20.55,
         "filename": "{DALI_IMAGE_DIR}contacts-circle.png",
         "width": 100,
         "height": 100,
-        "load-policy": "IMMEDIATE",
-        "release-policy": "NEVER"
+        "loadPolicy": "IMMEDIATE",
+        "releasePolicy": "NEVER"
       }
     },
     {
         817.499887599389,
         0
       ],
-      "inherit-position": true,
+      "inheritPosition": true,
       "size": [
         360,
         77,
         "filename": "{DALI_IMAGE_DIR}contacts-plain.png",
         "width": 360,
         "height": 77,
-        "load-policy": "IMMEDIATE",
-        "release-policy": "NEVER"
+        "loadPolicy": "IMMEDIATE",
+        "releasePolicy": "NEVER"
       }
     },
     {
         401.485,
         0
       ],
-      "inherit-position": true,
+      "inheritPosition": true,
       "size": [
         693.96,
         84.97,
             609.5059654033565,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.503,
             "duration": 0.005
           },
             20,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 4.071,
             "duration": 0.005
           },
             71,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 4.498,
             "duration": 0.3
           },
             611.5150431968526,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 4.498,
             "duration": 0.005
           },
             239.01,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 1.22,
             "duration": 0.396
           },
             402,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 4.437,
             "duration": 0.396
           },
             242,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 1.22,
             "duration": 0.395
           },
             1,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 1.22,
             "duration": 0.395
           },
             35.33,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 1.22,
             "duration": 0.395
           },
             405,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 4.435,
             "duration": 0.395
           },
             0.2,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 4.435,
             "duration": 0.395
           },
             24.33,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 4.435,
             "duration": 0.395
           },
             138.98,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 1.222,
             "duration": 0.391
           },
             138.98,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 4.435,
             "duration": 0.391
           },
             320.50795521899136,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 1.346,
             "duration": 0.372
           },
             677.51,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 4.34,
             "duration": 0.372
           },
             395.5,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 1.432,
             "duration": 0.39
           },
             704.5,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 4.218,
             "duration": 0.39
           },
             470.01,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 1.543,
             "duration": 0.385
           },
             727.01,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 4.11,
             "duration": 0.385
           },
             541.5,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 1.635,
             "duration": 0.406
           },
             749.5,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 3.993,
             "duration": 0.406
           },
             608.5139116202711,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 1.726,
             "duration": 0.435
           },
             817.51,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 3.865,
             "duration": 0.435
           },
             48.280475138643396,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 2.66,
             "duration": 0.005
           },
             48.280475138643396,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 2.851,
             "duration": 0.008
           },
             80,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 2.665,
             "duration": 1.187
           },
             470.05397482417106,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 1.031,
             "duration": 0.561
           },
             467.042499801712,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 4.342,
             "duration": 0.005
           },
             402.425,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0,
             "duration": 0.904
           },
index 0fdb7ab..43fe3d0 100644 (file)
@@ -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": [
             {
       "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",
       ]
     },
     {
-      "type": "selection-type",
-      "name": "selection-5",
-      "position-y": 255,
+      "type": "selectionType",
+      "name": "selection5",
+      "positionY": 255,
       "signals": [
         {
           "name": "tapped",
       ]
     },
     {
-      "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"
       }
     "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
           },
     "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
           },
     "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
           },
     "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
           },
     "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
           },
     "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
           },
index f92b710..6de3782 100644 (file)
@@ -19,6 +19,6 @@
   "stage": [{
     "type": "TextLabel",
     "text": "Hello World",
-    "parent-origin": "CENTER"
+    "parentOrigin": "CENTER"
   }]
 }
index 6d15238..dc197a0 100644 (file)
@@ -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,
             "filename": "{DALI_IMAGE_DIR}music-libray-rectangle.png",
             "width": 128,
             "height": 128,
-            "load-policy": "IMMEDIATE",
-            "release-policy": "NEVER"
+            "loadPolicy": "IMMEDIATE",
+            "releasePolicy": "NEVER"
           }
         }
       ],
         695,
         1
       ],
-      "inherit-position": true,
+      "inheritPosition": true,
       "size": [
         400,
         50,
             20,
             0
           ],
-          "inherit-position": true,
+          "inheritPosition": true,
           "size": [
             50,
             20,
           ],
           "sizeAspectRatio": false,
           "text": "12:30",
-          "point-size": 10
+          "pointSize": 10
         }
       ],
       "name": "Indicators",
         20,
         0
       ],
-      "inherit-position": true,
+      "inheritPosition": true,
       "size": [
         400,
         40,
         288,
         0
       ],
-      "inherit-position": true,
+      "inheritPosition": true,
       "size": [
         200,
         35,
         "filename": "{DALI_IMAGE_DIR}music-libray-foxtrot-oscar.png",
         "width": 545,
         "height": 95,
-        "load-policy": "IMMEDIATE",
-        "release-policy": "NEVER"
+        "loadPolicy": "IMMEDIATE",
+        "releasePolicy": "NEVER"
       }
     },
     {
         288,
         0
       ],
-      "inherit-position": true,
+      "inheritPosition": true,
       "size": [
         200,
         35,
         266,
         0
       ],
-      "inherit-position": true,
+      "inheritPosition": true,
       "size": [
         200,
         80,
         "filename": "{DALI_IMAGE_DIR}music-libray-the-solars.png",
         "width": 545,
         "height": 218,
-        "load-policy": "IMMEDIATE",
-        "release-policy": "NEVER"
+        "loadPolicy": "IMMEDIATE",
+        "releasePolicy": "NEVER"
       }
     },
     {
         266,
         0
       ],
-      "inherit-position": true,
+      "inheritPosition": true,
       "size": [
         200,
         80,
           "type": "Control",
           "name": "Tapped Record",
           "actors": [],
-          "position-inheritance":"USE_PARENT_POSITION",
+          "positionInheritance":"USE_PARENT_POSITION",
           "signals": [
             {
               "name": "tapped",
         206,
         0
       ],
-      "inherit-position": true,
+      "inheritPosition": true,
       "size": [
         200,
         200,
         "filename": "{DALI_IMAGE_DIR}music-libray-record-cover.png",
         "width": 545,
         "height": 502,
-        "load-policy": "IMMEDIATE",
-        "release-policy": "NEVER"
+        "loadPolicy": "IMMEDIATE",
+        "releasePolicy": "NEVER"
       }
     },
     {
         70,
         2
       ],
-      "inherit-position": true,
+      "inheritPosition": true,
       "size": [
         30,
         30,
         "filename": "{DALI_IMAGE_DIR}music-libray-arrow.png",
         "width": 128,
         "height": 128,
-        "load-policy": "IMMEDIATE",
-        "release-policy": "NEVER"
+        "loadPolicy": "IMMEDIATE",
+        "releasePolicy": "NEVER"
       }
     },
     {
         70,
         2
       ],
-      "inherit-position": true,
+      "inheritPosition": true,
       "size": [
         30,
         30,
         "filename": "{DALI_IMAGE_DIR}music-libray-star.png",
         "width": 121,
         "height": 128,
-        "load-policy": "IMMEDIATE",
-        "release-policy": "NEVER"
+        "loadPolicy": "IMMEDIATE",
+        "releasePolicy": "NEVER"
       }
     },
     {
         440,
         3
       ],
-      "inherit-position": true,
+      "inheritPosition": true,
       "size": [
         50,
         50,
         "filename": "{DALI_IMAGE_DIR}music-libray-pause.png",
         "width": 128,
         "height": 128,
-        "load-policy": "IMMEDIATE",
-        "release-policy": "NEVER"
+        "loadPolicy": "IMMEDIATE",
+        "releasePolicy": "NEVER"
       }
     },
     {
         70,
         2
       ],
-      "inherit-position": true,
+      "inheritPosition": true,
       "size": [
         30,
         30,
         "filename": "{DALI_IMAGE_DIR}music-libray-menu.png",
         "width": 32,
         "height": 32,
-        "load-policy": "IMMEDIATE",
-        "release-policy": "NEVER"
+        "loadPolicy": "IMMEDIATE",
+        "releasePolicy": "NEVER"
       }
     }
   ],
       "properties": [
         {
           "actor": "Tapped Record",
-          "property": "color-alpha",
+          "property": "colorAlpha",
           "value": 0,
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0,
             "duration": 0.1
           },
             240,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0,
             "duration": 0.3
           },
             2,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0,
             "duration": 0.3
           },
             0.6509803921568628,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.3,
             "duration": 0.2
           },
             360,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0,
             "duration": 0.3
           },
             520,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.3,
             "duration": 0.2
           },
             2,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0,
             "duration": 0.3
           },
             360,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0,
             "duration": 0.3
           },
             520,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.3,
             "duration": 0.2
           },
             2,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0,
             "duration": 0.3
           },
             1,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.5,
             "duration": 0.2
           },
             288,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0,
             "duration": 0.3
           },
             635,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.3,
             "duration": 0.2
           },
             2,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0,
             "duration": 0.3
           },
             288,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0,
             "duration": 0.3
           },
             635,
             0
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.3,
             "duration": 0.2
           },
             2,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0,
             "duration": 0.3
           },
             1,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.5,
             "duration": 0.2
           },
             70,
             2
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.3,
             "duration": 0.2
           },
             70,
             2
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.299,
             "duration": 0.2
           },
             70,
             2
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.3,
             "duration": 0.2
           },
             440,
             3
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.599,
             "duration": 0.1
           },
             0.1,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.6,
             "duration": 0.1
           },
             1,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.7,
             "duration": 0.3
           },
index 70a2eef..9111394 100644 (file)
@@ -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"
         }
     },
     {
       "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
         }
       "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"
     }
   ]
 }
index 82f8d23..648a913 100644 (file)
@@ -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"
         }
           "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
index e08ceb0..84bc1c5 100644 (file)
 {
   "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]
     }
   }
 }
index 8d4a4a7..a4e4755 100644 (file)
 {
   "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]
   }]
 }
index c786b47..bcdb61b 100644 (file)
     "blur": {
       "duration": 1,
       "properties": [{
-        "actor": "super-blur",
-        "property": "blur-strength",
+        "actor": "superBlur",
+        "property": "blurStrength",
         "value": 1,
-        "time-period": {
+        "timePeriod": {
           "delay": 0,
           "duration": 1
         }
     "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": {
     // 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",
index 54f16d8..81392c1 100644 (file)
   */
 
   "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
           }
         }]
     }]
index 72eaa57..e837b10 100644 (file)
@@ -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,
       "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,
       "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,
             1,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.35,
             "duration": 0.15
           },
             0.10000000000000003,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 2.449,
             "duration": 0.15
           },
         },
         {
           "actor": "Container 1",
-          "property": "color-alpha",
+          "property": "colorAlpha",
           "value": 1,
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.3,
             "duration": 0.05
           },
         },
         {
           "actor": "Container 1",
-          "property": "color-alpha",
+          "property": "colorAlpha",
           "value": 0,
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 2.599,
             "duration": 0.051
           },
             1,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.4,
             "duration": 0.15
           },
             0.1,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 2.5,
             "duration": 0.15
           },
         },
         {
           "actor": "Container 2",
-          "property": "color-alpha",
+          "property": "colorAlpha",
           "value": 1,
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.35,
             "duration": 0.05
           },
         },
         {
           "actor": "Container 2",
-          "property": "color-alpha",
+          "property": "colorAlpha",
           "value": 0,
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 2.65,
             "duration": 0.05
           },
             1,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.45,
             "duration": 0.15
           },
             0.1,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 2.55,
             "duration": 0.15
           },
         },
         {
           "actor": "Container 3",
-          "property": "color-alpha",
+          "property": "colorAlpha",
           "value": 1,
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.4,
             "duration": 0.05
           },
         },
         {
           "actor": "Container 3",
-          "property": "color-alpha",
+          "property": "colorAlpha",
           "value": 0,
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 2.7,
             "duration": 0.05
           },
             1,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.5,
             "duration": 0.15
           },
             0.1,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 2.6,
             "duration": 0.15
           },
         },
         {
           "actor": "Container 4",
-          "property": "color-alpha",
+          "property": "colorAlpha",
           "value": 1,
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.45,
             "duration": 0.05
           },
         },
         {
           "actor": "Container 4",
-          "property": "color-alpha",
+          "property": "colorAlpha",
           "value": 0,
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 2.75,
             "duration": 0.05
           },
             1,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.45,
             "duration": 0.15
           },
             0.1,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 2.65,
             "duration": 0.15
           },
         },
         {
           "actor": "Container 5",
-          "property": "color-alpha",
+          "property": "colorAlpha",
           "value": 1,
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.4,
             "duration": 0.05
           },
         },
         {
           "actor": "Container 5",
-          "property": "color-alpha",
+          "property": "colorAlpha",
           "value": 0,
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 2.8,
             "duration": 0.05
           },
             1,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.5,
             "duration": 0.15
           },
             0.1,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 2.7,
             "duration": 0.15
           },
         },
         {
           "actor": "Container 6",
-          "property": "color-alpha",
+          "property": "colorAlpha",
           "value": 1,
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.45,
             "duration": 0.05
           },
         },
         {
           "actor": "Container 6",
-          "property": "color-alpha",
+          "property": "colorAlpha",
           "value": 0,
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 2.85,
             "duration": 0.05
           },
             1,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.55,
             "duration": 0.15
           },
             0.1,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 2.75,
             "duration": 0.15
           },
         },
         {
           "actor": "Container 7",
-          "property": "color-alpha",
+          "property": "colorAlpha",
           "value": 1,
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.5,
             "duration": 0.05
           },
         },
         {
           "actor": "Container 7",
-          "property": "color-alpha",
+          "property": "colorAlpha",
           "value": 0,
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 2.9,
             "duration": 0.05
           },
             1,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.6,
             "duration": 0.15
           },
             0.1,
             1
           ],
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 2.8,
             "duration": 0.15
           },
         },
         {
           "actor": "Container 8",
-          "property": "color-alpha",
+          "property": "colorAlpha",
           "value": 1,
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 0.55,
             "duration": 0.05
           },
         },
         {
           "actor": "Container 8",
-          "property": "color-alpha",
+          "property": "colorAlpha",
           "value": 0,
-          "alpha-function": "LINEAR",
-          "time-period": {
+          "alphaFunction": "LINEAR",
+          "timePeriod": {
             "delay": 2.95,
             "duration": 0.05
           },
index 64fe786..b7d30ab 100644 (file)
@@ -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]
       }
     }
   }
index 653fbea..ce18131 100644 (file)
@@ -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]
       }
     }
   }