Peter M. Groen / dali-demo

Commit bee076667baf97664b38aacdc4f7d7874a8540cc

Authored by Tom Robinson
2 parents d23654c7 1cb7a20f

[dali_1.1.9] Merge branch 'devel/master' 

Change-Id: I85f0b96947654217eef755d2e8d0b2d6fb5e53a4
Inline Side-by-side
Showing 37 changed files with 1161 additions and 1138 deletions
builder/dali-builder.cpp
  View file @bee0766
@@ -56,7 +56,7 @@ std::string JSON_BROKEN(" \ @@ -56,7 +56,7 @@ std::string JSON_BROKEN(" \
56 { \ 56 { \
57 'type':'TextActor', \ 57 'type':'TextActor', \
58 'size': [50,50,1], \ 58 'size': [50,50,1], \
59 - 'parent-origin': 'CENTER', \ 59 + 'parentOrigin': 'CENTER', \
60 'text':'COULD NOT LOAD JSON FILE' \ 60 'text':'COULD NOT LOAD JSON FILE' \
61 } \ 61 } \
62 ] \ 62 ] \
demo/dali-table-view.cpp
  View file @bee0766
@@ -938,11 +938,11 @@ void DaliTableView::OnLogoTapped( Dali::Actor actor, const Dali::TapGesture& tap @@ -938,11 +938,11 @@ void DaliTableView::OnLogoTapped( Dali::Actor actor, const Dali::TapGesture& tap
938 mVersionPopup = Dali::Toolkit::Popup::New(); 938 mVersionPopup = Dali::Toolkit::Popup::New();
939 939
940 Toolkit::TextLabel titleActor = Toolkit::TextLabel::New( "Version information" ); 940 Toolkit::TextLabel titleActor = Toolkit::TextLabel::New( "Version information" );
941 - titleActor.SetName( "title-actor" ); 941 + titleActor.SetName( "titleActor" );
942 titleActor.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); 942 titleActor.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
943 943
944 Toolkit::TextLabel contentActor = Toolkit::TextLabel::New( stream.str() ); 944 Toolkit::TextLabel contentActor = Toolkit::TextLabel::New( stream.str() );
945 - contentActor.SetName( "content-actor" ); 945 + contentActor.SetName( "contentActor" );
946 contentActor.SetProperty( Toolkit::TextLabel::Property::MULTI_LINE, true ); 946 contentActor.SetProperty( Toolkit::TextLabel::Property::MULTI_LINE, true );
947 contentActor.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); 947 contentActor.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
948 contentActor.SetPadding( Padding( 0.0f, 0.0f, 20.0f, 0.0f ) ); 948 contentActor.SetPadding( Padding( 0.0f, 0.0f, 20.0f, 0.0f ) );
examples/atlas/atlas-example.cpp
  View file @bee0766
@@ -77,8 +77,8 @@ public: @@ -77,8 +77,8 @@ public:
77 mLoseContextButton.ClickedSignal().Connect( this, &AtlasController::OnLoseContextButtonClicked ); 77 mLoseContextButton.ClickedSignal().Connect( this, &AtlasController::OnLoseContextButtonClicked );
78 mToolBar.AddControl( mLoseContextButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING ); 78 mToolBar.AddControl( mLoseContextButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
79 79
80 - mAtlas = Atlas::New( 400,300, Pixel::RGBA8888);  
81 - mAtlas.Clear(Vector4(0.f,0.5f,0.5f,0.5f)); 80 + mAtlas = Atlas::New( 400,700, Pixel::RGBA8888);
  81 + mAtlas.Clear(Vector4(0.f,0.5f,0.5f,0.25f));
82 mAtlas.Upload( DALI_IMAGE_DIR "icon-change.png", 50, 30 ); 82 mAtlas.Upload( DALI_IMAGE_DIR "icon-change.png", 50, 30 );
83 mAtlas.Upload( DALI_IMAGE_DIR "icon-cluster-carousel.png", 100, 30 ); 83 mAtlas.Upload( DALI_IMAGE_DIR "icon-cluster-carousel.png", 100, 30 );
84 mAtlas.Upload( DALI_IMAGE_DIR "icon-effects-on.png", 150, 30 ); 84 mAtlas.Upload( DALI_IMAGE_DIR "icon-effects-on.png", 150, 30 );
@@ -88,37 +88,28 @@ public: @@ -88,37 +88,28 @@ public:
88 mAtlas.Upload( DALI_IMAGE_DIR "icon-item-view-layout-depth.png", 150, 130 ); 88 mAtlas.Upload( DALI_IMAGE_DIR "icon-item-view-layout-depth.png", 150, 130 );
89 mAtlas.Upload( DALI_IMAGE_DIR "icon-item-view-layout-grid.png", 200, 130 ); 89 mAtlas.Upload( DALI_IMAGE_DIR "icon-item-view-layout-grid.png", 200, 130 );
90 mAtlas.Upload( DALI_IMAGE_DIR "icon-item-view-layout-spiral.png", 250, 130 ); 90 mAtlas.Upload( DALI_IMAGE_DIR "icon-item-view-layout-spiral.png", 250, 130 );
  91 +
91 UploadBufferImages(); 92 UploadBufferImages();
  93 + UploadPixelData();
  94 +
  95 + mAtlas.Upload( DALI_IMAGE_DIR "gallery-small-1.jpg", 4, 304 );
  96 + mAtlas.Upload( DALI_IMAGE_DIR "gallery-small-2.jpg", 136, 304 );
  97 + mAtlas.Upload( DALI_IMAGE_DIR "gallery-small-3.jpg", 268, 304 );
  98 + mAtlas.Upload( DALI_IMAGE_DIR "gallery-small-4.jpg", 4, 436 );
  99 + mAtlas.Upload( DALI_IMAGE_DIR "gallery-small-5.jpg", 136, 436 );
  100 + mAtlas.Upload( DALI_IMAGE_DIR "gallery-small-6.jpg", 268, 436 );
  101 + mAtlas.Upload( DALI_IMAGE_DIR "gallery-small-7.jpg", 4, 568 );
  102 + mAtlas.Upload( DALI_IMAGE_DIR "gallery-small-7.jpg", 136, 568 );
  103 + mAtlas.Upload( DALI_IMAGE_DIR "gallery-small-7.jpg", 268, 568 );
  104 +
  105 +
  106 + Toolkit::ImageView imageView = Toolkit::ImageView::New( mAtlas );
92 107
93 - Toolkit::ImageView imageActor1 = Toolkit::ImageView::New( mAtlas );  
94 - imageActor1.SetY(-170.f);  
95 - imageActor1.SetParentOrigin(ParentOrigin::CENTER);  
96 - mContentLayer.Add( imageActor1 );  
97 -  
98 - Atlas atlas2 = Atlas::New( 400,400, Pixel::RGB888);  
99 - atlas2.Clear( Color::RED );  
100 - atlas2.Upload( DALI_IMAGE_DIR "gallery-small-1.jpg", 4, 4 );  
101 - atlas2.Clear( Color::BLUE );  
102 - atlas2.Upload( DALI_IMAGE_DIR "gallery-small-2.jpg", 136, 4 );  
103 - atlas2.Upload( DALI_IMAGE_DIR "gallery-small-3.jpg", 268, 4 );  
104 - atlas2.Upload( DALI_IMAGE_DIR "gallery-small-4.jpg", 4, 136 );  
105 - atlas2.Upload( DALI_IMAGE_DIR "gallery-small-5.jpg", 136, 136 );  
106 - atlas2.Upload( DALI_IMAGE_DIR "gallery-small-6.jpg", 268, 135 );  
107 - atlas2.Upload( DALI_IMAGE_DIR "gallery-small-7.jpg", 4, 268 );  
108 - atlas2.Upload( DALI_IMAGE_DIR "gallery-small-7.jpg", 136, 268 );  
109 - atlas2.Upload( DALI_IMAGE_DIR "gallery-small-7.jpg", 268, 268 );  
110 -  
111 -  
112 - Toolkit::ImageView imageView = Toolkit::ImageView::New( DALI_IMAGE_DIR "gallery-small-1.jpg" );  
113 -  
114 - imageView.SetY(200.f);  
115 - imageView.SetZ(-1.f);  
116 imageView.SetParentOrigin(ParentOrigin::CENTER); 108 imageView.SetParentOrigin(ParentOrigin::CENTER);
117 mContentLayer.Add( imageView ); 109 mContentLayer.Add( imageView );
118 110
119 mPanGestureDetector = PanGestureDetector::New(); 111 mPanGestureDetector = PanGestureDetector::New();
120 mPanGestureDetector.DetectedSignal().Connect( this, &AtlasController::OnPanGesture ); 112 mPanGestureDetector.DetectedSignal().Connect( this, &AtlasController::OnPanGesture );
121 - mPanGestureDetector.Attach( imageActor1 );  
122 mPanGestureDetector.Attach( imageView ); 113 mPanGestureDetector.Attach( imageView );
123 114
124 stage.ContextLostSignal().Connect( this, &AtlasController::OnContextLost ); 115 stage.ContextLostSignal().Connect( this, &AtlasController::OnContextLost );
@@ -136,10 +127,13 @@ public: @@ -136,10 +127,13 @@ public:
136 mAtlas.Upload( CreateBufferImage( Vector4(0.5f, 0.5f, 0.f, 0.5f ), 80, 30 ), 240, 210 ); 127 mAtlas.Upload( CreateBufferImage( Vector4(0.5f, 0.5f, 0.f, 0.5f ), 80, 30 ), 240, 210 );
137 mAtlas.Upload( CreateBufferImage( Vector4(0.25f, 0.25f, 0.f, 0.5f ), 80, 20 ), 280, 210 ); 128 mAtlas.Upload( CreateBufferImage( Vector4(0.25f, 0.25f, 0.f, 0.5f ), 80, 20 ), 280, 210 );
138 mAtlas.Upload( CreateBufferImage( Vector4(0.1f, 0.1f, 0.f, 0.5f ), 80, 10 ), 320, 210 ); 129 mAtlas.Upload( CreateBufferImage( Vector4(0.1f, 0.1f, 0.f, 0.5f ), 80, 10 ), 320, 210 );
139 - BufferImage redBlock = CreateBufferImage( Color::RED, 40, 40 );  
140 - mAtlas.Upload(redBlock, 320, 30);  
141 - mAtlas.Upload(redBlock, 320, 80);  
142 - mAtlas.Upload(redBlock, 320, 130); 130 + }
  131 +
  132 + void UploadPixelData()
  133 + {
  134 + mAtlas.Upload( CreatePixelData( Vector3(1.f, 1.f, 0.f ), 40, 40 ), 320, 30 );
  135 + mAtlas.Upload( CreatePixelData( Vector3(0.f, 1.f, 1.f ), 40, 40 ), 320, 80 );
  136 + mAtlas.Upload( CreatePixelData( Vector3(1.f, 0.f, 1.f ), 40, 40 ), 320, 130 );
143 } 137 }
144 138
145 static void NewWindow(void) 139 static void NewWindow(void)
@@ -183,6 +177,7 @@ public: @@ -183,6 +177,7 @@ public:
183 { 177 {
184 printf("Stage reporting context regain\n"); 178 printf("Stage reporting context regain\n");
185 UploadBufferImages(); 179 UploadBufferImages();
  180 + UploadPixelData();
186 } 181 }
187 182
188 private: 183 private:
@@ -202,11 +197,23 @@ private: @@ -202,11 +197,23 @@ private:
202 pixbuf[i*4+3] = 0xFF * color.a; 197 pixbuf[i*4+3] = 0xFF * color.a;
203 } 198 }
204 199
205 - imageData.Update();  
206 -  
207 return imageData; 200 return imageData;
208 } 201 }
209 202
  203 + PixelDataPtr CreatePixelData( const Vector3& color, const unsigned int width, const unsigned int height )
  204 + {
  205 + unsigned int size = width*height;
  206 + unsigned char* pixels = new unsigned char [size*3u];
  207 + for( unsigned int i = 0; i < size; i++ )
  208 + {
  209 + pixels[i*3u] = 0xFF * color.x;
  210 + pixels[i*3u+1u] = 0xFF * color.y;
  211 + pixels[i*3u+2u] = 0xFF * color.z;
  212 + }
  213 +
  214 + return PixelData::New( pixels, width, height, Pixel::RGB888, PixelData::DELETE_ARRAY );
  215 + }
  216 +
210 217
211 private: 218 private:
212 Application& mApplication; 219 Application& mApplication;
examples/blocks/blocks-example.cpp
  View file @bee0766
@@ -56,8 +56,8 @@ const Vector3 PADDLE_COLLISION_MARGIN(0.0f, 0.0f, 0.0f); ///&lt; @@ -56,8 +56,8 @@ const Vector3 PADDLE_COLLISION_MARGIN(0.0f, 0.0f, 0.0f); ///&lt;
56 const Vector3 BRICK_COLLISION_MARGIN(0.0f, 0.0f, 0.0f); ///< Collision margin for ball-brick detection. 56 const Vector3 BRICK_COLLISION_MARGIN(0.0f, 0.0f, 0.0f); ///< Collision margin for ball-brick detection.
57 const Vector3 INITIAL_BALL_DIRECTION(1.0f, 1.0f, 0.0f); ///< Initial ball direction. 57 const Vector3 INITIAL_BALL_DIRECTION(1.0f, 1.0f, 0.0f); ///< Initial ball direction.
58 58
59 -const std::string WOBBLE_PROPERTY_NAME("wobble-property"); ///< Wobble property name.  
60 -const std::string COLLISION_PROPERTY_NAME("collision-property"); ///< Collision property name. 59 +const std::string WOBBLE_PROPERTY_NAME("wobbleProperty"); ///< Wobble property name.
  60 +const std::string COLLISION_PROPERTY_NAME("collisionProperty"); ///< Collision property name.
61 61
62 const Vector2 BRICK_SIZE(0.1f, 0.05f ); ///< Brick size relative to width of stage. 62 const Vector2 BRICK_SIZE(0.1f, 0.05f ); ///< Brick size relative to width of stage.
63 const Vector2 BALL_SIZE( 0.05f, 0.05f ); ///< Ball size relative to width of stage. 63 const Vector2 BALL_SIZE( 0.05f, 0.05f ); ///< Ball size relative to width of stage.
examples/builder/examples.cpp
  View file @bee0766
@@ -64,7 +64,7 @@ std::string JSON_BROKEN(&quot; \ @@ -64,7 +64,7 @@ std::string JSON_BROKEN(&quot; \
64 { \ 64 { \
65 'type':'TextLabel', \ 65 'type':'TextLabel', \
66 'size': [50,50,1], \ 66 'size': [50,50,1], \
67 - 'parent-origin': 'CENTER', \ 67 + 'parentOrigin': 'CENTER', \
68 'text':'COULD NOT LOAD JSON FILE' \ 68 'text':'COULD NOT LOAD JSON FILE' \
69 } \ 69 } \
70 ] \ 70 ] \
examples/buttons/buttons-example.cpp
  View file @bee0766
@@ -206,7 +206,7 @@ class ButtonsController: public ConnectionTracker @@ -206,7 +206,7 @@ class ButtonsController: public ConnectionTracker
206 // Create select button 206 // Create select button
207 mUpdateButton = Toolkit::PushButton::New(); 207 mUpdateButton = Toolkit::PushButton::New();
208 mUpdateButton.SetLabelText( "Select" ); 208 mUpdateButton.SetLabelText( "Select" );
209 - mUpdateButton.SetName( "select-button" ); 209 + mUpdateButton.SetName( "selectButton" );
210 mUpdateButton.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); 210 mUpdateButton.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
211 211
212 mUpdateButton.ClickedSignal().Connect( this, &ButtonsController::OnButtonClicked ); 212 mUpdateButton.ClickedSignal().Connect( this, &ButtonsController::OnButtonClicked );
@@ -268,7 +268,7 @@ class ButtonsController: public ConnectionTracker @@ -268,7 +268,7 @@ class ButtonsController: public ConnectionTracker
268 // First radio button 268 // First radio button
269 { 269 {
270 Toolkit::RadioButton radioButton = Dali::Toolkit::RadioButton::New( "Select enabled" ); 270 Toolkit::RadioButton radioButton = Dali::Toolkit::RadioButton::New( "Select enabled" );
271 - radioButton.SetName( "radio-select-enable" ); 271 + radioButton.SetName( "radioSelectEnable" );
272 radioButton.SetParentOrigin( ParentOrigin::TOP_LEFT ); 272 radioButton.SetParentOrigin( ParentOrigin::TOP_LEFT );
273 radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT ); 273 radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
274 radioButton.SetPosition( 0, 0 ); 274 radioButton.SetPosition( 0, 0 );
@@ -282,7 +282,7 @@ class ButtonsController: public ConnectionTracker @@ -282,7 +282,7 @@ class ButtonsController: public ConnectionTracker
282 // Second radio button 282 // Second radio button
283 { 283 {
284 Toolkit::RadioButton radioButton = Dali::Toolkit::RadioButton::New( "Select disabled" ); 284 Toolkit::RadioButton radioButton = Dali::Toolkit::RadioButton::New( "Select disabled" );
285 - radioButton.SetName( "radio-select-disable" ); 285 + radioButton.SetName( "radioSelectDisable" );
286 radioButton.SetParentOrigin( ParentOrigin::TOP_LEFT ); 286 radioButton.SetParentOrigin( ParentOrigin::TOP_LEFT );
287 radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT ); 287 radioButton.SetAnchorPoint( AnchorPoint::TOP_LEFT );
288 radioButton.SetPosition( 0, DP(50) ); 288 radioButton.SetPosition( 0, DP(50) );
@@ -390,7 +390,7 @@ class ButtonsController: public ConnectionTracker @@ -390,7 +390,7 @@ class ButtonsController: public ConnectionTracker
390 390
391 bool EnableSelectButton( Toolkit::Button button ) 391 bool EnableSelectButton( Toolkit::Button button )
392 { 392 {
393 - if( button.GetName() == "radio-select-enable" && button.IsSelected() == true ) 393 + if( button.GetName() == "radioSelectEnable" && button.IsSelected() == true )
394 { 394 {
395 mUpdateButton.SetDisabled( false ); 395 mUpdateButton.SetDisabled( false );
396 396
@@ -404,7 +404,7 @@ class ButtonsController: public ConnectionTracker @@ -404,7 +404,7 @@ class ButtonsController: public ConnectionTracker
404 404
405 mToggleButton.SetDisabled( false ); 405 mToggleButton.SetDisabled( false );
406 } 406 }
407 - else if( button.GetName() == "radio-select-disable" && button.IsSelected() == true ) 407 + else if( button.GetName() == "radioSelectDisable" && button.IsSelected() == true )
408 { 408 {
409 mUpdateButton.SetDisabled( true ); 409 mUpdateButton.SetDisabled( true );
410 410
examples/gradients/gradients-example.cpp
  View file @bee0766
@@ -79,21 +79,21 @@ public: @@ -79,21 +79,21 @@ public:
79 79
80 // ---- Gradient for background 80 // ---- Gradient for background
81 81
82 - mGradientMap.Insert("renderer-type", "gradient-renderer"); 82 + mGradientMap.Insert("rendererType", "gradientRenderer");
83 Property::Array stopOffsets; 83 Property::Array stopOffsets;
84 stopOffsets.PushBack( 0.0f ); 84 stopOffsets.PushBack( 0.0f );
85 stopOffsets.PushBack( 0.3f ); 85 stopOffsets.PushBack( 0.3f );
86 stopOffsets.PushBack( 0.6f ); 86 stopOffsets.PushBack( 0.6f );
87 stopOffsets.PushBack( 0.8f ); 87 stopOffsets.PushBack( 0.8f );
88 stopOffsets.PushBack( 1.f ); 88 stopOffsets.PushBack( 1.f );
89 - mGradientMap.Insert("gradient-stop-offset", stopOffsets); 89 + mGradientMap.Insert("gradientStopOffset", stopOffsets);
90 Property::Array stopColors; 90 Property::Array stopColors;
91 stopColors.PushBack( Vector4( 129.f, 198.f, 193.f, 255.f )/255.f ); 91 stopColors.PushBack( Vector4( 129.f, 198.f, 193.f, 255.f )/255.f );
92 stopColors.PushBack( Vector4( 196.f, 198.f, 71.f, 122.f )/255.f ); 92 stopColors.PushBack( Vector4( 196.f, 198.f, 71.f, 122.f )/255.f );
93 stopColors.PushBack( Vector4( 214.f, 37.f, 139.f, 191.f )/255.f ); 93 stopColors.PushBack( Vector4( 214.f, 37.f, 139.f, 191.f )/255.f );
94 stopColors.PushBack( Vector4( 129.f, 198.f, 193.f, 150.f )/255.f ); 94 stopColors.PushBack( Vector4( 129.f, 198.f, 193.f, 150.f )/255.f );
95 stopColors.PushBack( Color::YELLOW ); 95 stopColors.PushBack( Color::YELLOW );
96 - mGradientMap.Insert("gradient-stop-color", stopColors); 96 + mGradientMap.Insert("gradientStopColor", stopColors);
97 97
98 OnChangeIconClicked( changeButton ); 98 OnChangeIconClicked( changeButton );
99 } 99 }
@@ -106,30 +106,30 @@ public: @@ -106,30 +106,30 @@ public:
106 { 106 {
107 case 0: // linear gradient with units as objectBoundingBox 107 case 0: // linear gradient with units as objectBoundingBox
108 { 108 {
109 - gradientMap.Insert("gradient-start-position", Vector2( 0.5f, 0.5f ));  
110 - gradientMap.Insert("gradient-end-position", Vector2( -0.5f, -0.5f )); 109 + gradientMap.Insert("gradientStartPosition", Vector2( 0.5f, 0.5f ));
  110 + gradientMap.Insert("gradientEndPosition", Vector2( -0.5f, -0.5f ));
111 break; 111 break;
112 } 112 }
113 case 1: // linear gradient with units as userSpaceOnUse 113 case 1: // linear gradient with units as userSpaceOnUse
114 { 114 {
115 Vector2 halfStageSize = Stage::GetCurrent().GetSize()*0.5f; 115 Vector2 halfStageSize = Stage::GetCurrent().GetSize()*0.5f;
116 - gradientMap.Insert("gradient-start-position", halfStageSize);  
117 - gradientMap.Insert("gradient-end-position", -halfStageSize );  
118 - gradientMap.Insert("gradient-units", "user-space"); 116 + gradientMap.Insert("gradientStartPosition", halfStageSize);
  117 + gradientMap.Insert("gradientEndPosition", -halfStageSize );
  118 + gradientMap.Insert("gradientUnits", "userSpace");
119 break; 119 break;
120 } 120 }
121 case 2: // radial gradient with units as objectBoundingBox 121 case 2: // radial gradient with units as objectBoundingBox
122 { 122 {
123 - gradientMap.Insert("gradient-center", Vector2(0.5f, 0.5f));  
124 - gradientMap.Insert("gradient-radius", 1.414f); 123 + gradientMap.Insert("gradientCenter", Vector2(0.5f, 0.5f));
  124 + gradientMap.Insert("gradientRadius", 1.414f);
125 break; 125 break;
126 } 126 }
127 default: // radial gradient with units as userSpaceOnUse 127 default: // radial gradient with units as userSpaceOnUse
128 { 128 {
129 Vector2 stageSize = Stage::GetCurrent().GetSize(); 129 Vector2 stageSize = Stage::GetCurrent().GetSize();
130 - gradientMap.Insert("gradient-center", stageSize*0.5f);  
131 - gradientMap.Insert("gradient-radius", stageSize.Length());  
132 - gradientMap.Insert("gradient-units", "user-space"); 130 + gradientMap.Insert("gradientCenter", stageSize*0.5f);
  131 + gradientMap.Insert("gradientRadius", stageSize.Length());
  132 + gradientMap.Insert("gradientUnits", "userSpace");
133 break; 133 break;
134 } 134 }
135 } 135 }
examples/hello-world/hello-world-example.cpp
  View file @bee0766
@@ -47,7 +47,7 @@ public: @@ -47,7 +47,7 @@ public:
47 47
48 TextLabel textLabel = TextLabel::New( "Hello World" ); 48 TextLabel textLabel = TextLabel::New( "Hello World" );
49 textLabel.SetAnchorPoint( AnchorPoint::TOP_LEFT ); 49 textLabel.SetAnchorPoint( AnchorPoint::TOP_LEFT );
50 - textLabel.SetName( "hello-world-label" ); 50 + textLabel.SetName( "helloWorldLabel" );
51 stage.Add( textLabel ); 51 stage.Add( textLabel );
52 52
53 // Respond to a click anywhere on the stage 53 // Respond to a click anywhere on the stage
examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
  View file @bee0766
@@ -171,12 +171,12 @@ public: @@ -171,12 +171,12 @@ public:
171 171
172 // Background image: 172 // Background image:
173 Dali::Property::Map backgroundImage; 173 Dali::Property::Map backgroundImage;
174 - backgroundImage.Insert( "renderer-type", "image-renderer" );  
175 - backgroundImage.Insert( "image-url", BACKGROUND_IMAGE );  
176 - backgroundImage.Insert( "image-desired-width", stage.GetSize().width );  
177 - backgroundImage.Insert( "image-desired-height", stage.GetSize().height );  
178 - backgroundImage.Insert( "image-fitting-mode", "scale-to-fill" );  
179 - backgroundImage.Insert( "image-sampling-mode", "box-then-nearest" ); 174 + backgroundImage.Insert( "rendererType", "imageRenderer" );
  175 + backgroundImage.Insert( "imageUrl", BACKGROUND_IMAGE );
  176 + backgroundImage.Insert( "imageDesiredWidth", stage.GetSize().width );
  177 + backgroundImage.Insert( "imageDesiredHeight", stage.GetSize().height );
  178 + backgroundImage.Insert( "imageFittingMode", "scaleToFill" );
  179 + backgroundImage.Insert( "imageSamplingMode", "boxThenNearest" );
180 180
181 Toolkit::ImageView background = Toolkit::ImageView::New(); 181 Toolkit::ImageView background = Toolkit::ImageView::New();
182 background.SetProperty( Toolkit::ImageView::Property::IMAGE, backgroundImage ); 182 background.SetProperty( Toolkit::ImageView::Property::IMAGE, backgroundImage );
examples/image-view/image-view-example.cpp
  View file @bee0766
@@ -141,6 +141,8 @@ class ImageViewController: public ConnectionTracker @@ -141,6 +141,8 @@ class ImageViewController: public ConnectionTracker
141 buttonsTable.AddChild( button3, Toolkit::TableView::CellPosition( 2, 0 ) ); 141 buttonsTable.AddChild( button3, Toolkit::TableView::CellPosition( 2, 0 ) );
142 142
143 mContentLayer.Add(buttonsTable); 143 mContentLayer.Add(buttonsTable);
  144 +
  145 + Stage::GetCurrent().KeyEventSignal().Connect(this, &ImageViewController::OnKeyEvent);
144 } 146 }
145 147
146 private: 148 private:
@@ -220,6 +222,20 @@ private: @@ -220,6 +222,20 @@ private:
220 return true; 222 return true;
221 } 223 }
222 224
  225 + /**
  226 + * Main key event handler
  227 + */
  228 + void OnKeyEvent(const KeyEvent& event)
  229 + {
  230 + if(event.state == KeyEvent::Down)
  231 + {
  232 + if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
  233 + {
  234 + mApplication.Quit();
  235 + }
  236 + }
  237 + }
  238 +
223 private: 239 private:
224 Application& mApplication; 240 Application& mApplication;
225 241
examples/magnifier/magnifier-example.cpp
  View file @bee0766
@@ -245,7 +245,7 @@ public: @@ -245,7 +245,7 @@ public:
245 mBouncingMagnifier.SetProperty( Toolkit::Magnifier::Property::MAGNIFICATION_FACTOR, MAGNIFICATION_FACTOR ); 245 mBouncingMagnifier.SetProperty( Toolkit::Magnifier::Property::MAGNIFICATION_FACTOR, MAGNIFICATION_FACTOR );
246 overlay.Add( mBouncingMagnifier ); 246 overlay.Add( mBouncingMagnifier );
247 247
248 - mAnimationTimeProperty = mBouncingMagnifier.RegisterProperty("animation-time", 0.0f); 248 + mAnimationTimeProperty = mBouncingMagnifier.RegisterProperty("animationTime", 0.0f);
249 ContinueAnimation(); 249 ContinueAnimation();
250 250
251 // Apply constraint to animate the position of the magnifier. 251 // Apply constraint to animate the position of the magnifier.
examples/model3d-view/model3d-view-example.cpp
  View file @bee0766
@@ -95,7 +95,7 @@ public: @@ -95,7 +95,7 @@ public:
95 mModel3dView = Model3dView::New( MODEL_FILE[0], MATERIAL_FILE[0], IMAGE_PATH ); 95 mModel3dView = Model3dView::New( MODEL_FILE[0], MATERIAL_FILE[0], IMAGE_PATH );
96 mModel3dView.SetParentOrigin( ParentOrigin::CENTER ); 96 mModel3dView.SetParentOrigin( ParentOrigin::CENTER );
97 mModel3dView.SetAnchorPoint( AnchorPoint::CENTER ); 97 mModel3dView.SetAnchorPoint( AnchorPoint::CENTER );
98 - mModel3dView.SetName( "model3d-view-control" ); 98 + mModel3dView.SetName( "model3dViewControl" );
99 mModel3dView.SetResizePolicy(ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS); 99 mModel3dView.SetResizePolicy(ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS);
100 mModel3dView.SetSize(screenSize); 100 mModel3dView.SetSize(screenSize);
101 101
examples/new-window/new-window-example.cpp
  View file @bee0766
@@ -211,7 +211,7 @@ void NewWindowController::Create( Application&amp; app ) @@ -211,7 +211,7 @@ void NewWindowController::Create( Application&amp; app )
211 211
212 Image image = ResourceImage::New(LOGO_IMAGE); 212 Image image = ResourceImage::New(LOGO_IMAGE);
213 ImageView imageView = ImageView::New(image); 213 ImageView imageView = ImageView::New(image);
214 - imageView.SetName("dali-logo"); 214 + imageView.SetName("daliLogo");
215 imageView.SetParentOrigin(ParentOrigin::CENTER); 215 imageView.SetParentOrigin(ParentOrigin::CENTER);
216 imageView.SetAnchorPoint(AnchorPoint::BOTTOM_CENTER); 216 imageView.SetAnchorPoint(AnchorPoint::BOTTOM_CENTER);
217 logoLayoutActor.Add(imageView); 217 logoLayoutActor.Add(imageView);
@@ -477,7 +477,7 @@ Dali::Property::Map NewWindowController::CreateColorModifierer() @@ -477,7 +477,7 @@ Dali::Property::Map NewWindowController::CreateColorModifierer()
477 477
478 Property::Map map; 478 Property::Map map;
479 Property::Map customShader; 479 Property::Map customShader;
480 - customShader[ "fragment-shader" ] = fragmentShader; 480 + customShader[ "fragmentShader" ] = fragmentShader;
481 map[ "shader" ] = customShader; 481 map[ "shader" ] = customShader;
482 482
483 return map; 483 return map;
examples/popup/popup-example.cpp
  View file @bee0766
@@ -56,8 +56,8 @@ const char* const POPUP_BUTTON_FIXED_SIZE_ID = &quot;POPUP_BUTTON_FIXED_SIZE_ID&quot;; @@ -56,8 +56,8 @@ const char* const POPUP_BUTTON_FIXED_SIZE_ID = &quot;POPUP_BUTTON_FIXED_SIZE_ID&quot;;
56 const char* const POPUP_BUTTON_COMPLEX_ID = "POPUP_BUTTON_COMPLEX"; 56 const char* const POPUP_BUTTON_COMPLEX_ID = "POPUP_BUTTON_COMPLEX";
57 57
58 // Names to give Popup PushButton controls. 58 // Names to give Popup PushButton controls.
59 -const char* const POPUP_CONTROL_OK_NAME = "control-ok";  
60 -const char* const POPUP_CONTROL_CANCEL_NAME = "control-cancel"; 59 +const char* const POPUP_CONTROL_OK_NAME = "controlOk";
  60 +const char* const POPUP_CONTROL_CANCEL_NAME = "controlCancel";
61 61
62 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."; 62 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.";
63 const char* const IMAGE1 = DALI_IMAGE_DIR "gallery-medium-5.jpg"; 63 const char* const IMAGE1 = DALI_IMAGE_DIR "gallery-medium-5.jpg";
@@ -352,7 +352,7 @@ public: @@ -352,7 +352,7 @@ public:
352 { 352 {
353 // Start with a control area image. 353 // Start with a control area image.
354 Toolkit::ImageView footer = Toolkit::ImageView::New( DEFAULT_CONTROL_AREA_IMAGE_PATH ); 354 Toolkit::ImageView footer = Toolkit::ImageView::New( DEFAULT_CONTROL_AREA_IMAGE_PATH );
355 - footer.SetName( "control-area-image" ); 355 + footer.SetName( "controlAreaImage" );
356 // Set up the container's layout. 356 // Set up the container's layout.
357 footer.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); 357 footer.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
358 footer.SetResizePolicy( ResizePolicy::FIXED, Dimension::HEIGHT ); 358 footer.SetResizePolicy( ResizePolicy::FIXED, Dimension::HEIGHT );
@@ -407,7 +407,7 @@ public: @@ -407,7 +407,7 @@ public:
407 Actor CreateTitle( std::string title ) 407 Actor CreateTitle( std::string title )
408 { 408 {
409 Toolkit::TextLabel titleActor = Toolkit::TextLabel::New( title ); 409 Toolkit::TextLabel titleActor = Toolkit::TextLabel::New( title );
410 - titleActor.SetName( "title-actor" ); 410 + titleActor.SetName( "titleActor" );
411 titleActor.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Color::WHITE ); 411 titleActor.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Color::WHITE );
412 titleActor.SetProperty( Toolkit::TextLabel::Property::MULTI_LINE, true ); 412 titleActor.SetProperty( Toolkit::TextLabel::Property::MULTI_LINE, true );
413 titleActor.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); 413 titleActor.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
@@ -471,7 +471,7 @@ public: @@ -471,7 +471,7 @@ public:
471 else if( button.GetName() == POPUP_BUTTON_TOAST_ID ) 471 else if( button.GetName() == POPUP_BUTTON_TOAST_ID )
472 { 472 {
473 // Create a toast popup via the type registry (as it is a named-type). 473 // Create a toast popup via the type registry (as it is a named-type).
474 - TypeInfo typeInfo = TypeRegistry::Get().GetTypeInfo( "popup-toast" ); 474 + TypeInfo typeInfo = TypeRegistry::Get().GetTypeInfo( "popupToast" );
475 if( typeInfo ) 475 if( typeInfo )
476 { 476 {
477 BaseHandle baseHandle = typeInfo.CreateInstance(); 477 BaseHandle baseHandle = typeInfo.CreateInstance();
examples/text-field/text-field-example.cpp
  View file @bee0766
@@ -115,7 +115,7 @@ public: @@ -115,7 +115,7 @@ public:
115 TextField CreateTextField( const Vector2& stageSize, const std::string& text ) 115 TextField CreateTextField( const Vector2& stageSize, const std::string& text )
116 { 116 {
117 TextField field = TextField::New(); 117 TextField field = TextField::New();
118 - field.SetName("text-field"); 118 + field.SetName("textField");
119 field.SetAnchorPoint( AnchorPoint::TOP_LEFT ); 119 field.SetAnchorPoint( AnchorPoint::TOP_LEFT );
120 field.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); 120 field.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
121 field.SetResizePolicy( ResizePolicy::DIMENSION_DEPENDENCY, Dimension::HEIGHT ); 121 field.SetResizePolicy( ResizePolicy::DIMENSION_DEPENDENCY, Dimension::HEIGHT );
examples/text-message-field/text-message-field-example.cpp
  View file @bee0766
@@ -89,9 +89,9 @@ public: @@ -89,9 +89,9 @@ public:
89 Control photoBoxA = Control::New(); 89 Control photoBoxA = Control::New();
90 90
91 Dali::Property::Map border; 91 Dali::Property::Map border;
92 - border.Insert( "renderer-type", "border-renderer" );  
93 - border.Insert( "border-color", Color::WHITE );  
94 - border.Insert( "border-size", 1.f ); 92 + border.Insert( "rendererType", "borderRenderer" );
  93 + border.Insert( "borderColor", Color::WHITE );
  94 + border.Insert( "borderSize", 1.f );
95 photoBoxA.SetProperty( Control::Property::BACKGROUND, border ); 95 photoBoxA.SetProperty( Control::Property::BACKGROUND, border );
96 96
97 photoBoxA.SetName("photoBoxA"); 97 photoBoxA.SetName("photoBoxA");
examples/textured-mesh/textured-mesh-example.cpp
  View file @bee0766
@@ -175,10 +175,10 @@ public: @@ -175,10 +175,10 @@ public:
175 mMeshActor2.AddRenderer( mRenderer2 ); 175 mMeshActor2.AddRenderer( mRenderer2 );
176 mMeshActor2.SetSize(400, 400); 176 mMeshActor2.SetSize(400, 400);
177 177
178 - mMeshActor2.RegisterProperty( "a-n-other-property", Color::GREEN ); 178 + mMeshActor2.RegisterProperty( "anotherProperty", Color::GREEN );
179 179
180 - mRenderer2.RegisterProperty( "a-n-other-property", Vector3::ZERO );  
181 - mRenderer2.RegisterProperty( "a-coefficient", 0.008f ); 180 + mRenderer2.RegisterProperty( "anotherProperty", Vector3::ZERO );
  181 + mRenderer2.RegisterProperty( "aCoefficient", 0.008f );
182 Property::Index fadeColorIndex2 = mRenderer2.RegisterProperty( "uFadeColor", Color::BLUE ); 182 Property::Index fadeColorIndex2 = mRenderer2.RegisterProperty( "uFadeColor", Color::BLUE );
183 mRenderer2.SetDepthIndex(0); 183 mRenderer2.SetDepthIndex(0);
184 184
packaging/com.samsung.dali-demo.spec
  View file @bee0766
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 2
3 Name: com.samsung.dali-demo 3 Name: com.samsung.dali-demo
4 Summary: The OpenGLES Canvas Core Demo 4 Summary: The OpenGLES Canvas Core Demo
5 -Version: 1.1.8 5 +Version: 1.1.9
6 Release: 1 6 Release: 1
7 Group: System/Libraries 7 Group: System/Libraries
8 License: Apache-2.0 8 License: Apache-2.0
resources/scripts/animated-buttons.json
  View file @bee0766
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 { 3 {
4 "type": "ImageActor", 4 "type": "ImageActor",
5 "name": "On", 5 "name": "On",
6 - "relayout-enabled": false, 6 + "relayoutEnabled": false,
7 "position": [ 7 "position": [
8 374, 8 374,
9 215, 9 215,
@@ -25,8 +25,8 @@ @@ -25,8 +25,8 @@
25 "filename": "{DALI_IMAGE_DIR}spot_button_on.png", 25 "filename": "{DALI_IMAGE_DIR}spot_button_on.png",
26 "width": 144, 26 "width": 144,
27 "height": 144, 27 "height": 144,
28 - "load-policy": "IMMEDIATE",  
29 - "release-policy": "NEVER" 28 + "loadPolicy": "IMMEDIATE",
  29 + "releasePolicy": "NEVER"
30 }, 30 },
31 "path": "spot_button_on.png", 31 "path": "spot_button_on.png",
32 "actors": [] 32 "actors": []
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
34 { 34 {
35 "type": "ImageActor", 35 "type": "ImageActor",
36 "name": "Off", 36 "name": "Off",
37 - "relayout-enabled": false, 37 + "relayoutEnabled": false,
38 "position": [ 38 "position": [
39 129, 39 129,
40 215, 40 215,
@@ -56,8 +56,8 @@ @@ -56,8 +56,8 @@
56 "filename": "{DALI_IMAGE_DIR}spot_button_off.png", 56 "filename": "{DALI_IMAGE_DIR}spot_button_off.png",
57 "width": 144, 57 "width": 144,
58 "height": 144, 58 "height": 144,
59 - "load-policy": "IMMEDIATE",  
60 - "release-policy": "NEVER" 59 + "loadPolicy": "IMMEDIATE",
  60 + "releasePolicy": "NEVER"
61 }, 61 },
62 "path": "spot_button_off.png", 62 "path": "spot_button_off.png",
63 "actors": [] 63 "actors": []
@@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@
65 { 65 {
66 "type": "ImageActor", 66 "type": "ImageActor",
67 "name": "Right", 67 "name": "Right",
68 - "relayout-enabled": false, 68 + "relayoutEnabled": false,
69 "position": [ 69 "position": [
70 418.5, 70 418.5,
71 214.5, 71 214.5,
@@ -88,8 +88,8 @@ @@ -88,8 +88,8 @@
88 "filename": "{DALI_IMAGE_DIR}curve-right.png", 88 "filename": "{DALI_IMAGE_DIR}curve-right.png",
89 "width": 85, 89 "width": 85,
90 "height": 161, 90 "height": 161,
91 - "load-policy": "IMMEDIATE",  
92 - "release-policy": "NEVER" 91 + "loadPolicy": "IMMEDIATE",
  92 + "releasePolicy": "NEVER"
93 }, 93 },
94 "path": "curve-right.png", 94 "path": "curve-right.png",
95 "actors": [] 95 "actors": []
@@ -97,7 +97,7 @@ @@ -97,7 +97,7 @@
97 { 97 {
98 "type": "ImageActor", 98 "type": "ImageActor",
99 "name": "Left", 99 "name": "Left",
100 - "relayout-enabled": false, 100 + "relayoutEnabled": false,
101 "position": [ 101 "position": [
102 331, 102 331,
103 214.5, 103 214.5,
@@ -120,8 +120,8 @@ @@ -120,8 +120,8 @@
120 "filename": "{DALI_IMAGE_DIR}curve-left.png", 120 "filename": "{DALI_IMAGE_DIR}curve-left.png",
121 "width": 87, 121 "width": 87,
122 "height": 161, 122 "height": 161,
123 - "load-policy": "IMMEDIATE",  
124 - "release-policy": "NEVER" 123 + "loadPolicy": "IMMEDIATE",
  124 + "releasePolicy": "NEVER"
125 }, 125 },
126 "path": "curve-left.png", 126 "path": "curve-left.png",
127 "actors": [] 127 "actors": []
@@ -129,13 +129,13 @@ @@ -129,13 +129,13 @@
129 { 129 {
130 "type": "ImageActor", 130 "type": "ImageActor",
131 "name": "Middle", 131 "name": "Middle",
132 - "relayout-enabled": false, 132 + "relayoutEnabled": false,
133 "position": [ 133 "position": [
134 375.5, 134 375.5,
135 214.5, 135 214.5,
136 0 136 0
137 ], 137 ],
138 - "anchor-point": [ 138 + "anchorPoint": [
139 0, 139 0,
140 0.5, 140 0.5,
141 0.5 141 0.5
@@ -156,8 +156,8 @@ @@ -156,8 +156,8 @@
156 "filename": "{DALI_IMAGE_DIR}curve-middle.png", 156 "filename": "{DALI_IMAGE_DIR}curve-middle.png",
157 "width": 13, 157 "width": 13,
158 "height": 161, 158 "height": 161,
159 - "load-policy": "IMMEDIATE",  
160 - "release-policy": "NEVER" 159 + "loadPolicy": "IMMEDIATE",
  160 + "releasePolicy": "NEVER"
161 }, 161 },
162 "path": "curve-middle.png", 162 "path": "curve-middle.png",
163 "actors": [] 163 "actors": []
@@ -165,7 +165,7 @@ @@ -165,7 +165,7 @@
165 { 165 {
166 "type": "ImageActor", 166 "type": "ImageActor",
167 "name": "Jelly", 167 "name": "Jelly",
168 - "relayout-enabled": false, 168 + "relayoutEnabled": false,
169 "position": [ 169 "position": [
170 374, 170 374,
171 215, 171 215,
@@ -187,8 +187,8 @@ @@ -187,8 +187,8 @@
187 "filename": "{DALI_IMAGE_DIR}spot_jelly_on.png", 187 "filename": "{DALI_IMAGE_DIR}spot_jelly_on.png",
188 "width": 144, 188 "width": 144,
189 "height": 144, 189 "height": 144,
190 - "load-policy": "IMMEDIATE",  
191 - "release-policy": "NEVER" 190 + "loadPolicy": "IMMEDIATE",
  191 + "releasePolicy": "NEVER"
192 }, 192 },
193 "path": "spot_jelly_on.png", 193 "path": "spot_jelly_on.png",
194 "actors": [] 194 "actors": []
@@ -196,7 +196,7 @@ @@ -196,7 +196,7 @@
196 { 196 {
197 "type": "Control", 197 "type": "Control",
198 "name": "Left Crop", 198 "name": "Left Crop",
199 - "relayout-enabled": false, 199 + "relayoutEnabled": false,
200 "position": [ 200 "position": [
201 144.5, 201 144.5,
202 218.5, 202 218.5,
@@ -220,7 +220,7 @@ @@ -220,7 +220,7 @@
220 { 220 {
221 "type": "Control", 221 "type": "Control",
222 "name": "Right Crop", 222 "name": "Right Crop",
223 - "relayout-enabled": false, 223 + "relayoutEnabled": false,
224 "position": [ 224 "position": [
225 629.5, 225 629.5,
226 218.5, 226 218.5,
@@ -244,7 +244,7 @@ @@ -244,7 +244,7 @@
244 { 244 {
245 "type": "ImageActor", 245 "type": "ImageActor",
246 "name": "JellyOff", 246 "name": "JellyOff",
247 - "relayout-enabled": false, 247 + "relayoutEnabled": false,
248 "position": [ 248 "position": [
249 121, 249 121,
250 -117, 250 -117,
@@ -266,8 +266,8 @@ @@ -266,8 +266,8 @@
266 "filename": "{DALI_IMAGE_DIR}spot_jelly_off.png", 266 "filename": "{DALI_IMAGE_DIR}spot_jelly_off.png",
267 "width": 144, 267 "width": 144,
268 "height": 144, 268 "height": 144,
269 - "load-policy": "IMMEDIATE",  
270 - "release-policy": "NEVER" 269 + "loadPolicy": "IMMEDIATE",
  270 + "releasePolicy": "NEVER"
271 }, 271 },
272 "path": "spot_jelly_off.png", 272 "path": "spot_jelly_off.png",
273 "actors": [] 273 "actors": []
@@ -275,7 +275,7 @@ @@ -275,7 +275,7 @@
275 { 275 {
276 "type": "Control", 276 "type": "Control",
277 "name": "Control On", 277 "name": "Control On",
278 - "relayout-enabled": false, 278 + "relayoutEnabled": false,
279 "position": [ 279 "position": [
280 371.26116838487997, 280 371.26116838487997,
281 217.33333333333331, 281 217.33333333333331,
@@ -310,7 +310,7 @@ @@ -310,7 +310,7 @@
310 { 310 {
311 "type": "Control", 311 "type": "Control",
312 "name": "Control Off", 312 "name": "Control Off",
313 - "relayout-enabled": false, 313 + "relayoutEnabled": false,
314 "position": [ 314 "position": [
315 123.5, 315 123.5,
316 -117, 316 -117,
@@ -349,8 +349,8 @@ @@ -349,8 +349,8 @@
349 214.5, 349 214.5,
350 0 350 0
351 ], 351 ],
352 - "alpha-function": "EASE_OUT",  
353 - "time-period": { 352 + "alphaFunction": "EASE_OUT",
  353 + "timePeriod": {
354 "delay": 3.106, 354 "delay": 3.106,
355 "duration": 1.465 355 "duration": 1.465
356 }, 356 },
@@ -364,8 +364,8 @@ @@ -364,8 +364,8 @@
364 214.5, 364 214.5,
365 0 365 0
366 ], 366 ],
367 - "alpha-function": "EASE_OUT",  
368 - "time-period": { 367 + "alphaFunction": "EASE_OUT",
  368 + "timePeriod": {
369 "delay": 3.106, 369 "delay": 3.106,
370 "duration": 1.465 370 "duration": 1.465
371 }, 371 },
@@ -379,8 +379,8 @@ @@ -379,8 +379,8 @@
379 161, 379 161,
380 1 380 1
381 ], 381 ],
382 - "alpha-function": "EASE_OUT",  
383 - "time-period": { 382 + "alphaFunction": "EASE_OUT",
  383 + "timePeriod": {
384 "delay": 0, 384 "delay": 0,
385 "duration": 1.27 385 "duration": 1.27
386 }, 386 },
@@ -394,8 +394,8 @@ @@ -394,8 +394,8 @@
394 161, 394 161,
395 1 395 1
396 ], 396 ],
397 - "alpha-function": "EASE_OUT",  
398 - "time-period": { 397 + "alphaFunction": "EASE_OUT",
  398 + "timePeriod": {
399 "delay": 3.127, 399 "delay": 3.127,
400 "duration": 1.44 400 "duration": 1.44
401 }, 401 },
@@ -409,8 +409,8 @@ @@ -409,8 +409,8 @@
409 215, 409 215,
410 0 410 0
411 ], 411 ],
412 - "alpha-function": "EASE_OUT",  
413 - "time-period": { 412 + "alphaFunction": "EASE_OUT",
  413 + "timePeriod": {
414 "delay": 1.486, 414 "delay": 1.486,
415 "duration": 1.29 415 "duration": 1.29
416 }, 416 },
@@ -424,8 +424,8 @@ @@ -424,8 +424,8 @@
424 218.5, 424 218.5,
425 0.5 425 0.5
426 ], 426 ],
427 - "alpha-function": "EASE_OUT",  
428 - "time-period": { 427 + "alphaFunction": "EASE_OUT",
  428 + "timePeriod": {
429 "delay": 3.106, 429 "delay": 3.106,
430 "duration": 1.47 430 "duration": 1.47
431 }, 431 },
@@ -439,8 +439,8 @@ @@ -439,8 +439,8 @@
439 214.5, 439 214.5,
440 0 440 0
441 ], 441 ],
442 - "alpha-function": "EASE_OUT",  
443 - "time-period": { 442 + "alphaFunction": "EASE_OUT",
  443 + "timePeriod": {
444 "delay": 0, 444 "delay": 0,
445 "duration": 1.27 445 "duration": 1.27
446 }, 446 },
@@ -454,8 +454,8 @@ @@ -454,8 +454,8 @@
454 218.5, 454 218.5,
455 0.5 455 0.5
456 ], 456 ],
457 - "alpha-function": "EASE_OUT",  
458 - "time-period": { 457 + "alphaFunction": "EASE_OUT",
  458 + "timePeriod": {
459 "delay": 0, 459 "delay": 0,
460 "duration": 1.276 460 "duration": 1.276
461 }, 461 },
@@ -469,8 +469,8 @@ @@ -469,8 +469,8 @@
469 217.33333333333331, 469 217.33333333333331,
470 0 470 0
471 ], 471 ],
472 - "alpha-function": "LINEAR",  
473 - "time-period": { 472 + "alphaFunction": "LINEAR",
  473 + "timePeriod": {
474 "delay": 2.765, 474 "delay": 2.765,
475 "duration": 0.001 475 "duration": 0.001
476 }, 476 },
@@ -484,8 +484,8 @@ @@ -484,8 +484,8 @@
484 -117, 484 -117,
485 0 485 0
486 ], 486 ],
487 - "alpha-function": "LINEAR",  
488 - "time-period": { 487 + "alphaFunction": "LINEAR",
  488 + "timePeriod": {
489 "delay": 0, 489 "delay": 0,
490 "duration": 0.001 490 "duration": 0.001
491 }, 491 },
@@ -499,8 +499,8 @@ @@ -499,8 +499,8 @@
499 215, 499 215,
500 0 500 0
501 ], 501 ],
502 - "alpha-function": "LINEAR",  
503 - "time-period": { 502 + "alphaFunction": "LINEAR",
  503 + "timePeriod": {
504 "delay": 2.765, 504 "delay": 2.765,
505 "duration": 0.001 505 "duration": 0.001
506 }, 506 },
@@ -514,8 +514,8 @@ @@ -514,8 +514,8 @@
514 -117, 514 -117,
515 0 515 0
516 ], 516 ],
517 - "alpha-function": "LINEAR",  
518 - "time-period": { 517 + "alphaFunction": "LINEAR",
  518 + "timePeriod": {
519 "delay": 2.765, 519 "delay": 2.765,
520 "duration": 0.001 520 "duration": 0.001
521 }, 521 },
@@ -529,8 +529,8 @@ @@ -529,8 +529,8 @@
529 -117, 529 -117,
530 0 530 0
531 ], 531 ],
532 - "alpha-function": "LINEAR",  
533 - "time-period": { 532 + "alphaFunction": "LINEAR",
  533 + "timePeriod": {
534 "delay": 0, 534 "delay": 0,
535 "duration": 0.001 535 "duration": 0.001
536 }, 536 },
@@ -549,8 +549,8 @@ @@ -549,8 +549,8 @@
549 214.5, 549 214.5,
550 0 550 0
551 ], 551 ],
552 - "alpha-function": "EASE_OUT",  
553 - "time-period": { 552 + "alphaFunction": "EASE_OUT",
  553 + "timePeriod": {
554 "delay": 0, 554 "delay": 0,
555 "duration": 1.27 555 "duration": 1.27
556 }, 556 },
@@ -564,8 +564,8 @@ @@ -564,8 +564,8 @@
564 214.5, 564 214.5,
565 0 565 0
566 ], 566 ],
567 - "alpha-function": "EASE_OUT",  
568 - "time-period": { 567 + "alphaFunction": "EASE_OUT",
  568 + "timePeriod": {
569 "delay": 0, 569 "delay": 0,
570 "duration": 1.27 570 "duration": 1.27
571 }, 571 },
@@ -579,8 +579,8 @@ @@ -579,8 +579,8 @@
579 161, 579 161,
580 1 580 1
581 ], 581 ],
582 - "alpha-function": "EASE_OUT",  
583 - "time-period": { 582 + "alphaFunction": "EASE_OUT",
  583 + "timePeriod": {
584 "delay": 0, 584 "delay": 0,
585 "duration": 1.27 585 "duration": 1.27
586 }, 586 },
@@ -594,8 +594,8 @@ @@ -594,8 +594,8 @@
594 161, 594 161,
595 1 595 1
596 ], 596 ],
597 - "alpha-function": "EASE_OUT",  
598 - "time-period": { 597 + "alphaFunction": "EASE_OUT",
  598 + "timePeriod": {
599 "delay": 3.127, 599 "delay": 3.127,
600 "duration": 1.44 600 "duration": 1.44
601 }, 601 },
@@ -609,8 +609,8 @@ @@ -609,8 +609,8 @@
609 215, 609 215,
610 0 610 0
611 ], 611 ],
612 - "alpha-function": "EASE_OUT",  
613 - "time-period": { 612 + "alphaFunction": "EASE_OUT",
  613 + "timePeriod": {
614 "delay": 1.486, 614 "delay": 1.486,
615 "duration": 1.29 615 "duration": 1.29
616 }, 616 },
@@ -624,8 +624,8 @@ @@ -624,8 +624,8 @@
624 219, 624 219,
625 0 625 0
626 ], 626 ],
627 - "alpha-function": "EASE_OUT",  
628 - "time-period": { 627 + "alphaFunction": "EASE_OUT",
  628 + "timePeriod": {
629 "delay": 0, 629 "delay": 0,
630 "duration": 1.276 630 "duration": 1.276
631 }, 631 },
@@ -639,8 +639,8 @@ @@ -639,8 +639,8 @@
639 214.5, 639 214.5,
640 0.5 640 0.5
641 ], 641 ],
642 - "alpha-function": "EASE_OUT",  
643 - "time-period": { 642 + "alphaFunction": "EASE_OUT",
  643 + "timePeriod": {
644 "delay": 3.106, 644 "delay": 3.106,
645 "duration": 1.465 645 "duration": 1.465
646 }, 646 },
@@ -654,8 +654,8 @@ @@ -654,8 +654,8 @@
654 218.5, 654 218.5,
655 0.5 655 0.5
656 ], 656 ],
657 - "alpha-function": "EASE_OUT",  
658 - "time-period": { 657 + "alphaFunction": "EASE_OUT",
  658 + "timePeriod": {
659 "delay": 3.106, 659 "delay": 3.106,
660 "duration": 1.47 660 "duration": 1.47
661 }, 661 },
@@ -669,8 +669,8 @@ @@ -669,8 +669,8 @@
669 -131, 669 -131,
670 0 670 0
671 ], 671 ],
672 - "alpha-function": "LINEAR",  
673 - "time-period": { 672 + "alphaFunction": "LINEAR",
  673 + "timePeriod": {
674 "delay": 0, 674 "delay": 0,
675 "duration": 0.001 675 "duration": 0.001
676 }, 676 },
@@ -684,8 +684,8 @@ @@ -684,8 +684,8 @@
684 215, 684 215,
685 0 685 0
686 ], 686 ],
687 - "alpha-function": "LINEAR",  
688 - "time-period": { 687 + "alphaFunction": "LINEAR",
  688 + "timePeriod": {
689 "delay": 2.765, 689 "delay": 2.765,
690 "duration": 0.001 690 "duration": 0.001
691 }, 691 },
@@ -699,8 +699,8 @@ @@ -699,8 +699,8 @@
699 -117, 699 -117,
700 0 700 0
701 ], 701 ],
702 - "alpha-function": "LINEAR",  
703 - "time-period": { 702 + "alphaFunction": "LINEAR",
  703 + "timePeriod": {
704 "delay": 2.765, 704 "delay": 2.765,
705 "duration": 0.001 705 "duration": 0.001
706 }, 706 },
@@ -714,8 +714,8 @@ @@ -714,8 +714,8 @@
714 215, 714 215,
715 0 715 0
716 ], 716 ],
717 - "alpha-function": "LINEAR",  
718 - "time-period": { 717 + "alphaFunction": "LINEAR",
  718 + "timePeriod": {
719 "delay": 2.765, 719 "delay": 2.765,
720 "duration": 0.001 720 "duration": 0.001
721 }, 721 },
resources/scripts/animated-colors.json
  View file @bee0766
@@ -27,13 +27,13 @@ @@ -27,13 +27,13 @@
27 0, 27 0,
28 0 28 0
29 ], 29 ],
30 - "inherit-position": true,  
31 - "parent-origin": [ 30 + "inheritPosition": true,
  31 + "parentOrigin": [
32 0, 32 0,
33 0.5, 33 0.5,
34 0.5 34 0.5
35 ], 35 ],
36 - "anchor-point": [ 36 + "anchorPoint": [
37 1, 37 1,
38 0.5, 38 0.5,
39 0.5 39 0.5
@@ -63,13 +63,13 @@ @@ -63,13 +63,13 @@
63 0, 63 0,
64 0 64 0
65 ], 65 ],
66 - "inherit-position": true,  
67 - "parent-origin": [ 66 + "inheritPosition": true,
  67 + "parentOrigin": [
68 0, 68 0,
69 0.5, 69 0.5,
70 0.5 70 0.5
71 ], 71 ],
72 - "anchor-point": [ 72 + "anchorPoint": [
73 1, 73 1,
74 0.5, 74 0.5,
75 0.5 75 0.5
@@ -99,13 +99,13 @@ @@ -99,13 +99,13 @@
99 0, 99 0,
100 0 100 0
101 ], 101 ],
102 - "inherit-position": true,  
103 - "parent-origin": [ 102 + "inheritPosition": true,
  103 + "parentOrigin": [
104 1, 104 1,
105 0.5, 105 0.5,
106 0.5 106 0.5
107 ], 107 ],
108 - "anchor-point": [ 108 + "anchorPoint": [
109 0, 109 0,
110 0.5, 110 0.5,
111 0.5 111 0.5
@@ -131,13 +131,13 @@ @@ -131,13 +131,13 @@
131 0, 131 0,
132 0 132 0
133 ], 133 ],
134 - "inherit-position": true,  
135 - "parent-origin": [ 134 + "inheritPosition": true,
  135 + "parentOrigin": [
136 1, 136 1,
137 0.5, 137 0.5,
138 0.5 138 0.5
139 ], 139 ],
140 - "anchor-point": [ 140 + "anchorPoint": [
141 0, 141 0,
142 0.5, 142 0.5,
143 0.5 143 0.5
@@ -167,13 +167,13 @@ @@ -167,13 +167,13 @@
167 0, 167 0,
168 0 168 0
169 ], 169 ],
170 - "inherit-position": true,  
171 - "parent-origin": [ 170 + "inheritPosition": true,
  171 + "parentOrigin": [
172 0, 172 0,
173 0.5, 173 0.5,
174 0.5 174 0.5
175 ], 175 ],
176 - "anchor-point": [ 176 + "anchorPoint": [
177 1, 177 1,
178 0.5, 178 0.5,
179 0.5 179 0.5
@@ -203,13 +203,13 @@ @@ -203,13 +203,13 @@
203 0, 203 0,
204 0 204 0
205 ], 205 ],
206 - "inherit-position": true,  
207 - "parent-origin": [ 206 + "inheritPosition": true,
  207 + "parentOrigin": [
208 1, 208 1,
209 0.5, 209 0.5,
210 0.5 210 0.5
211 ], 211 ],
212 - "anchor-point": [ 212 + "anchorPoint": [
213 0, 213 0,
214 0.5, 214 0.5,
215 0.5 215 0.5
@@ -235,13 +235,13 @@ @@ -235,13 +235,13 @@
235 0, 235 0,
236 0 236 0
237 ], 237 ],
238 - "inherit-position": true,  
239 - "parent-origin": [ 238 + "inheritPosition": true,
  239 + "parentOrigin": [
240 1, 240 1,
241 0.5, 241 0.5,
242 0.5 242 0.5
243 ], 243 ],
244 - "anchor-point": [ 244 + "anchorPoint": [
245 0, 245 0,
246 0.5, 246 0.5,
247 0.5 247 0.5
@@ -271,13 +271,13 @@ @@ -271,13 +271,13 @@
271 0, 271 0,
272 0 272 0
273 ], 273 ],
274 - "inherit-position": true,  
275 - "parent-origin": [ 274 + "inheritPosition": true,
  275 + "parentOrigin": [
276 0, 276 0,
277 0.5, 277 0.5,
278 0.5 278 0.5
279 ], 279 ],
280 - "anchor-point": [ 280 + "anchorPoint": [
281 1, 281 1,
282 0.5, 282 0.5,
283 0.5 283 0.5
@@ -307,13 +307,13 @@ @@ -307,13 +307,13 @@
307 0, 307 0,
308 0 308 0
309 ], 309 ],
310 - "inherit-position": true,  
311 - "parent-origin": [ 310 + "inheritPosition": true,
  311 + "parentOrigin": [
312 1, 312 1,
313 0.5, 313 0.5,
314 0.5 314 0.5
315 ], 315 ],
316 - "anchor-point": [ 316 + "anchorPoint": [
317 0, 317 0,
318 0.5, 318 0.5,
319 0.5 319 0.5
@@ -339,13 +339,13 @@ @@ -339,13 +339,13 @@
339 0, 339 0,
340 0 340 0
341 ], 341 ],
342 - "inherit-position": true,  
343 - "parent-origin": [ 342 + "inheritPosition": true,
  343 + "parentOrigin": [
344 1, 344 1,
345 0.5, 345 0.5,
346 0.5 346 0.5
347 ], 347 ],
348 - "anchor-point": [ 348 + "anchorPoint": [
349 0, 349 0,
350 0.5, 350 0.5,
351 0.5 351 0.5
@@ -371,13 +371,13 @@ @@ -371,13 +371,13 @@
371 0, 371 0,
372 0 372 0
373 ], 373 ],
374 - "inherit-position": true,  
375 - "parent-origin": [ 374 + "inheritPosition": true,
  375 + "parentOrigin": [
376 0.5, 376 0.5,
377 1, 377 1,
378 0.5 378 0.5
379 ], 379 ],
380 - "anchor-point": [ 380 + "anchorPoint": [
381 0.5, 381 0.5,
382 0, 382 0,
383 0.5 383 0.5
@@ -403,13 +403,13 @@ @@ -403,13 +403,13 @@
403 0, 403 0,
404 0 404 0
405 ], 405 ],
406 - "inherit-position": true,  
407 - "parent-origin": [ 406 + "inheritPosition": true,
  407 + "parentOrigin": [
408 0.5, 408 0.5,
409 1, 409 1,
410 0.5 410 0.5
411 ], 411 ],
412 - "anchor-point": [ 412 + "anchorPoint": [
413 0.5, 413 0.5,
414 0, 414 0,
415 0.5 415 0.5
@@ -435,13 +435,13 @@ @@ -435,13 +435,13 @@
435 0, 435 0,
436 0 436 0
437 ], 437 ],
438 - "inherit-position": true,  
439 - "parent-origin": [ 438 + "inheritPosition": true,
  439 + "parentOrigin": [
440 0.5, 440 0.5,
441 1, 441 1,
442 0.5 442 0.5
443 ], 443 ],
444 - "anchor-point": [ 444 + "anchorPoint": [
445 0.5, 445 0.5,
446 0, 446 0,
447 0.5 447 0.5
@@ -471,13 +471,13 @@ @@ -471,13 +471,13 @@
471 0, 471 0,
472 0 472 0
473 ], 473 ],
474 - "inherit-position": true,  
475 - "parent-origin": [ 474 + "inheritPosition": true,
  475 + "parentOrigin": [
476 1, 476 1,
477 0.5, 477 0.5,
478 0.5 478 0.5
479 ], 479 ],
480 - "anchor-point": [ 480 + "anchorPoint": [
481 0, 481 0,
482 0.5, 482 0.5,
483 0.5 483 0.5
@@ -503,13 +503,13 @@ @@ -503,13 +503,13 @@
503 0, 503 0,
504 0 504 0
505 ], 505 ],
506 - "inherit-position": true,  
507 - "parent-origin": [ 506 + "inheritPosition": true,
  507 + "parentOrigin": [
508 1, 508 1,
509 0.5, 509 0.5,
510 0.5 510 0.5
511 ], 511 ],
512 - "anchor-point": [ 512 + "anchorPoint": [
513 0, 513 0,
514 0.5, 514 0.5,
515 0.5 515 0.5
@@ -542,13 +542,13 @@ @@ -542,13 +542,13 @@
542 0, 542 0,
543 0 543 0
544 ], 544 ],
545 - "inherit-position": true,  
546 - "parent-origin": [ 545 + "inheritPosition": true,
  546 + "parentOrigin": [
547 1, 547 1,
548 0.5, 548 0.5,
549 0.5 549 0.5
550 ], 550 ],
551 - "anchor-point": [ 551 + "anchorPoint": [
552 0, 552 0,
553 0.5, 553 0.5,
554 0.5 554 0.5
@@ -574,13 +574,13 @@ @@ -574,13 +574,13 @@
574 0, 574 0,
575 0 575 0
576 ], 576 ],
577 - "inherit-position": true,  
578 - "parent-origin": [ 577 + "inheritPosition": true,
  578 + "parentOrigin": [
579 1, 579 1,
580 0.5, 580 0.5,
581 0.5 581 0.5
582 ], 582 ],
583 - "anchor-point": [ 583 + "anchorPoint": [
584 0, 584 0,
585 0.5, 585 0.5,
586 0.5 586 0.5
@@ -607,13 +607,13 @@ @@ -607,13 +607,13 @@
607 0, 607 0,
608 0 608 0
609 ], 609 ],
610 - "inherit-position": true,  
611 - "parent-origin": [ 610 + "inheritPosition": true,
  611 + "parentOrigin": [
612 0, 612 0,
613 0.5, 613 0.5,
614 0.5 614 0.5
615 ], 615 ],
616 - "anchor-point": [ 616 + "anchorPoint": [
617 1, 617 1,
618 0.5, 618 0.5,
619 0.5 619 0.5
@@ -646,13 +646,13 @@ @@ -646,13 +646,13 @@
646 0, 646 0,
647 0 647 0
648 ], 648 ],
649 - "inherit-position": true,  
650 - "parent-origin": [ 649 + "inheritPosition": true,
  650 + "parentOrigin": [
651 1, 651 1,
652 0.5, 652 0.5,
653 0.5 653 0.5
654 ], 654 ],
655 - "anchor-point": [ 655 + "anchorPoint": [
656 0, 656 0,
657 0.5, 657 0.5,
658 0.5 658 0.5
@@ -678,13 +678,13 @@ @@ -678,13 +678,13 @@
678 0, 678 0,
679 0 679 0
680 ], 680 ],
681 - "inherit-position": true,  
682 - "parent-origin": [ 681 + "inheritPosition": true,
  682 + "parentOrigin": [
683 1, 683 1,
684 0.5, 684 0.5,
685 0.5 685 0.5
686 ], 686 ],
687 - "anchor-point": [ 687 + "anchorPoint": [
688 0, 688 0,
689 0.5, 689 0.5,
690 0.5 690 0.5
@@ -711,13 +711,13 @@ @@ -711,13 +711,13 @@
711 0, 711 0,
712 0 712 0
713 ], 713 ],
714 - "inherit-position": true,  
715 - "parent-origin": [ 714 + "inheritPosition": true,
  715 + "parentOrigin": [
716 0, 716 0,
717 0.5, 717 0.5,
718 0.5 718 0.5
719 ], 719 ],
720 - "anchor-point": [ 720 + "anchorPoint": [
721 1, 721 1,
722 0.5, 722 0.5,
723 0.5 723 0.5
@@ -743,13 +743,13 @@ @@ -743,13 +743,13 @@
743 0, 743 0,
744 0 744 0
745 ], 745 ],
746 - "inherit-position": true,  
747 - "parent-origin": [ 746 + "inheritPosition": true,
  747 + "parentOrigin": [
748 0.5, 748 0.5,
749 0, 749 0,
750 0.5 750 0.5
751 ], 751 ],
752 - "anchor-point": [ 752 + "anchorPoint": [
753 0.5, 753 0.5,
754 1, 754 1,
755 0.5 755 0.5
@@ -775,13 +775,13 @@ @@ -775,13 +775,13 @@
775 0, 775 0,
776 0 776 0
777 ], 777 ],
778 - "inherit-position": true,  
779 - "parent-origin": [ 778 + "inheritPosition": true,
  779 + "parentOrigin": [
780 0.5, 780 0.5,
781 0, 781 0,
782 0.5 782 0.5
783 ], 783 ],
784 - "anchor-point": [ 784 + "anchorPoint": [
785 0.5, 785 0.5,
786 1, 786 1,
787 0.5 787 0.5
@@ -803,10 +803,10 @@ @@ -803,10 +803,10 @@
803 { 803 {
804 "type": "TextLabel", 804 "type": "TextLabel",
805 "name": "text", 805 "name": "text",
806 - "parent-origin": "CENTER",  
807 - "anchor-point": "CENTER", 806 + "parentOrigin": "CENTER",
  807 + "anchorPoint": "CENTER",
808 "text": "START", 808 "text": "START",
809 - "point-size": 20, 809 + "pointSize": 20,
810 "signals": [ 810 "signals": [
811 { 811 {
812 "name": "tapped", 812 "name": "tapped",
@@ -827,13 +827,13 @@ @@ -827,13 +827,13 @@
827 0, 827 0,
828 0 828 0
829 ], 829 ],
830 - "inherit-position": true,  
831 - "parent-origin": [ 830 + "inheritPosition": true,
  831 + "parentOrigin": [
832 0.5, 832 0.5,
833 0.5, 833 0.5,
834 0.5 834 0.5
835 ], 835 ],
836 - "anchor-point": [ 836 + "anchorPoint": [
837 1, 837 1,
838 1, 838 1,
839 0.5 839 0.5
@@ -865,8 +865,8 @@ @@ -865,8 +865,8 @@
865 0, 865 0,
866 0 866 0
867 ], 867 ],
868 - "alpha-function": "LINEAR",  
869 - "time-period": { 868 + "alphaFunction": "LINEAR",
  869 + "timePeriod": {
870 "delay": 0, 870 "delay": 0,
871 "duration": 0.2 871 "duration": 0.2
872 }, 872 },
@@ -886,8 +886,8 @@ @@ -886,8 +886,8 @@
886 0.32941176470588235, 886 0.32941176470588235,
887 1 887 1
888 ], 888 ],
889 - "alpha-function": "SIN",  
890 - "time-period": { 889 + "alphaFunction": "SIN",
  890 + "timePeriod": {
891 "delay": 0, 891 "delay": 0,
892 "duration": 2 892 "duration": 2
893 }, 893 },
@@ -902,8 +902,8 @@ @@ -902,8 +902,8 @@
902 0.9098039215686274, 902 0.9098039215686274,
903 1 903 1
904 ], 904 ],
905 - "alpha-function": "SIN",  
906 - "time-period": { 905 + "alphaFunction": "SIN",
  906 + "timePeriod": {
907 "delay": 0, 907 "delay": 0,
908 "duration": 2 908 "duration": 2
909 }, 909 },
@@ -918,8 +918,8 @@ @@ -918,8 +918,8 @@
918 0.4235294117647059, 918 0.4235294117647059,
919 1 919 1
920 ], 920 ],
921 - "alpha-function": "SIN",  
922 - "time-period": { 921 + "alphaFunction": "SIN",
  922 + "timePeriod": {
923 "delay": 0, 923 "delay": 0,
924 "duration": 2 924 "duration": 2
925 }, 925 },
@@ -934,8 +934,8 @@ @@ -934,8 +934,8 @@
934 0.027450980392156862, 934 0.027450980392156862,
935 1 935 1
936 ], 936 ],
937 - "alpha-function": "SIN",  
938 - "time-period": { 937 + "alphaFunction": "SIN",
  938 + "timePeriod": {
939 "delay": 0, 939 "delay": 0,
940 "duration": 2 940 "duration": 2
941 }, 941 },
@@ -950,8 +950,8 @@ @@ -950,8 +950,8 @@
950 0.8627450980392157, 950 0.8627450980392157,
951 1 951 1
952 ], 952 ],
953 - "alpha-function": "SIN",  
954 - "time-period": { 953 + "alphaFunction": "SIN",
  954 + "timePeriod": {
955 "delay": 0, 955 "delay": 0,
956 "duration": 2 956 "duration": 2
957 }, 957 },
@@ -966,8 +966,8 @@ @@ -966,8 +966,8 @@
966 0.1803921568627451, 966 0.1803921568627451,
967 1 967 1
968 ], 968 ],
969 - "alpha-function": "SIN",  
970 - "time-period": { 969 + "alphaFunction": "SIN",
  970 + "timePeriod": {
971 "delay": 0, 971 "delay": 0,
972 "duration": 2 972 "duration": 2
973 }, 973 },
@@ -982,8 +982,8 @@ @@ -982,8 +982,8 @@
982 0.5333333333333333, 982 0.5333333333333333,
983 1 983 1
984 ], 984 ],
985 - "alpha-function": "SIN",  
986 - "time-period": { 985 + "alphaFunction": "SIN",
  986 + "timePeriod": {
987 "delay": 0, 987 "delay": 0,
988 "duration": 2 988 "duration": 2
989 }, 989 },
@@ -998,8 +998,8 @@ @@ -998,8 +998,8 @@
998 0, 998 0,
999 1 999 1
1000 ], 1000 ],
1001 - "alpha-function": "SIN",  
1002 - "time-period": { 1001 + "alphaFunction": "SIN",
  1002 + "timePeriod": {
1003 "delay": 0, 1003 "delay": 0,
1004 "duration": 2 1004 "duration": 2
1005 }, 1005 },
@@ -1014,8 +1014,8 @@ @@ -1014,8 +1014,8 @@
1014 1, 1014 1,
1015 1 1015 1
1016 ], 1016 ],
1017 - "alpha-function": "SIN",  
1018 - "time-period": { 1017 + "alphaFunction": "SIN",
  1018 + "timePeriod": {
1019 "delay": 0, 1019 "delay": 0,
1020 "duration": 2 1020 "duration": 2
1021 }, 1021 },
@@ -1030,8 +1030,8 @@ @@ -1030,8 +1030,8 @@
1030 0.06666666666666667, 1030 0.06666666666666667,
1031 1 1031 1
1032 ], 1032 ],
1033 - "alpha-function": "SIN",  
1034 - "time-period": { 1033 + "alphaFunction": "SIN",
  1034 + "timePeriod": {
1035 "delay": 0, 1035 "delay": 0,
1036 "duration": 2 1036 "duration": 2
1037 }, 1037 },
@@ -1046,8 +1046,8 @@ @@ -1046,8 +1046,8 @@
1046 0, 1046 0,
1047 1 1047 1
1048 ], 1048 ],
1049 - "alpha-function": "SIN",  
1050 - "time-period": { 1049 + "alphaFunction": "SIN",
  1050 + "timePeriod": {
1051 "delay": 0, 1051 "delay": 0,
1052 "duration": 2 1052 "duration": 2
1053 }, 1053 },
@@ -1062,8 +1062,8 @@ @@ -1062,8 +1062,8 @@
1062 0.788235294117647, 1062 0.788235294117647,
1063 1 1063 1
1064 ], 1064 ],
1065 - "alpha-function": "SIN",  
1066 - "time-period": { 1065 + "alphaFunction": "SIN",
  1066 + "timePeriod": {
1067 "delay": 0, 1067 "delay": 0,
1068 "duration": 2 1068 "duration": 2
1069 }, 1069 },
@@ -1078,8 +1078,8 @@ @@ -1078,8 +1078,8 @@
1078 0.7294117647058823, 1078 0.7294117647058823,
1079 1 1079 1
1080 ], 1080 ],
1081 - "alpha-function": "SIN",  
1082 - "time-period": { 1081 + "alphaFunction": "SIN",
  1082 + "timePeriod": {
1083 "delay": 0.001, 1083 "delay": 0.001,
1084 "duration": 2 1084 "duration": 2
1085 }, 1085 },
@@ -1094,8 +1094,8 @@ @@ -1094,8 +1094,8 @@
1094 1, 1094 1,
1095 1 1095 1
1096 ], 1096 ],
1097 - "alpha-function": "SIN",  
1098 - "time-period": { 1097 + "alphaFunction": "SIN",
  1098 + "timePeriod": {
1099 "delay": 0, 1099 "delay": 0,
1100 "duration": 2 1100 "duration": 2
1101 }, 1101 },
@@ -1110,8 +1110,8 @@ @@ -1110,8 +1110,8 @@
1110 0, 1110 0,
1111 1 1111 1
1112 ], 1112 ],
1113 - "alpha-function": "SIN",  
1114 - "time-period": { 1113 + "alphaFunction": "SIN",
  1114 + "timePeriod": {
1115 "delay": 0, 1115 "delay": 0,
1116 "duration": 2 1116 "duration": 2
1117 }, 1117 },
@@ -1126,8 +1126,8 @@ @@ -1126,8 +1126,8 @@
1126 0.5607843137254902, 1126 0.5607843137254902,
1127 1 1127 1
1128 ], 1128 ],
1129 - "alpha-function": "SIN",  
1130 - "time-period": { 1129 + "alphaFunction": "SIN",
  1130 + "timePeriod": {
1131 "delay": 0, 1131 "delay": 0,
1132 "duration": 2 1132 "duration": 2
1133 }, 1133 },
@@ -1142,8 +1142,8 @@ @@ -1142,8 +1142,8 @@
1142 1, 1142 1,
1143 1 1143 1
1144 ], 1144 ],
1145 - "alpha-function": "SIN",  
1146 - "time-period": { 1145 + "alphaFunction": "SIN",
  1146 + "timePeriod": {
1147 "delay": 0, 1147 "delay": 0,
1148 "duration": 2 1148 "duration": 2
1149 }, 1149 },
@@ -1158,8 +1158,8 @@ @@ -1158,8 +1158,8 @@
1158 0, 1158 0,
1159 1 1159 1
1160 ], 1160 ],
1161 - "alpha-function": "SIN",  
1162 - "time-period": { 1161 + "alphaFunction": "SIN",
  1162 + "timePeriod": {
1163 "delay": 0.001, 1163 "delay": 0.001,
1164 "duration": 2 1164 "duration": 2
1165 }, 1165 },
@@ -1174,8 +1174,8 @@ @@ -1174,8 +1174,8 @@
1174 0.24313725490196078, 1174 0.24313725490196078,
1175 1 1175 1
1176 ], 1176 ],
1177 - "alpha-function": "SIN",  
1178 - "time-period": { 1177 + "alphaFunction": "SIN",
  1178 + "timePeriod": {
1179 "delay": 0, 1179 "delay": 0,
1180 "duration": 2 1180 "duration": 2
1181 }, 1181 },
@@ -1190,8 +1190,8 @@ @@ -1190,8 +1190,8 @@
1190 0.43137254901960786, 1190 0.43137254901960786,
1191 1 1191 1
1192 ], 1192 ],
1193 - "alpha-function": "SIN",  
1194 - "time-period": { 1193 + "alphaFunction": "SIN",
  1194 + "timePeriod": {
1195 "delay": 0, 1195 "delay": 0,
1196 "duration": 2 1196 "duration": 2
1197 }, 1197 },
@@ -1206,8 +1206,8 @@ @@ -1206,8 +1206,8 @@
1206 0, 1206 0,
1207 1 1207 1
1208 ], 1208 ],
1209 - "alpha-function": "SIN",  
1210 - "time-period": { 1209 + "alphaFunction": "SIN",
  1210 + "timePeriod": {
1211 "delay": 0, 1211 "delay": 0,
1212 "duration": 2 1212 "duration": 2
1213 }, 1213 },
@@ -1222,8 +1222,8 @@ @@ -1222,8 +1222,8 @@
1222 1, 1222 1,
1223 1 1223 1
1224 ], 1224 ],
1225 - "alpha-function": "SIN",  
1226 - "time-period": { 1225 + "alphaFunction": "SIN",
  1226 + "timePeriod": {
1227 "delay": 0, 1227 "delay": 0,
1228 "duration": 2 1228 "duration": 2
1229 }, 1229 },
@@ -1238,8 +1238,8 @@ @@ -1238,8 +1238,8 @@
1238 0.6784313725490196, 1238 0.6784313725490196,
1239 1 1239 1
1240 ], 1240 ],
1241 - "alpha-function": "SIN",  
1242 - "time-period": { 1241 + "alphaFunction": "SIN",
  1242 + "timePeriod": {
1243 "delay": 0, 1243 "delay": 0,
1244 "duration": 2 1244 "duration": 2
1245 }, 1245 },
@@ -1254,8 +1254,8 @@ @@ -1254,8 +1254,8 @@
1254 0.4196078431372549, 1254 0.4196078431372549,
1255 1 1255 1
1256 ], 1256 ],
1257 - "alpha-function": "SIN",  
1258 - "time-period": { 1257 + "alphaFunction": "SIN",
  1258 + "timePeriod": {
1259 "delay": 0, 1259 "delay": 0,
1260 "duration": 2 1260 "duration": 2
1261 }, 1261 },
resources/scripts/animation.json
  View file @bee0766
@@ -17,11 +17,11 @@ @@ -17,11 +17,11 @@
17 { 17 {
18 // library of styles 18 // library of styles
19 "styles": { 19 "styles": {
20 - "red-theme": { 20 + "redTheme": {
21 "color": [1, 0, 0, 1] 21 "color": [1, 0, 0, 1]
22 }, 22 },
23 - "basic-text": {  
24 - "parent-origin": "CENTER" 23 + "basicText": {
  24 + "parentOrigin": "CENTER"
25 } 25 }
26 }, 26 },
27 "paths": 27 "paths":
@@ -40,8 +40,8 @@ @@ -40,8 +40,8 @@
40 "actor": "greeting", // referenced actors must exist on stage 40 "actor": "greeting", // referenced actors must exist on stage
41 "property": "position", 41 "property": "position",
42 "value": [300, 300, -1000], 42 "value": [300, 300, -1000],
43 - "alpha-function": "EASE_IN_OUT",  
44 - "time-period": { 43 + "alphaFunction": "EASE_IN_OUT",
  44 + "timePeriod": {
45 "delay": 0, 45 "delay": 0,
46 "duration": 3 46 "duration": 3
47 } 47 }
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
49 "actor": "greeting", // referenced actors must exist on stage 49 "actor": "greeting", // referenced actors must exist on stage
50 "property": "scale", 50 "property": "scale",
51 "value": [5, 5, 1], 51 "value": [5, 5, 1],
52 - "time-period": { 52 + "timePeriod": {
53 "delay": 2, 53 "delay": 2,
54 "duration": 3 54 "duration": 3
55 } 55 }
@@ -61,21 +61,21 @@ @@ -61,21 +61,21 @@
61 "actor": "image", // referenced actors must exist on stage 61 "actor": "image", // referenced actors must exist on stage
62 "property": "orientation", 62 "property": "orientation",
63 "value": [0, 0, -45], 63 "value": [0, 0, -45],
64 - "alpha-function": "EASE_IN_OUT",  
65 - "time-period": { 64 + "alphaFunction": "EASE_IN_OUT",
  65 + "timePeriod": {
66 "delay": 0, 66 "delay": 0,
67 "duration": 3 67 "duration": 3
68 } 68 }
69 }] 69 }]
70 }, 70 },
71 - "path-animation": { 71 + "pathAnimation": {
72 "duration": 3.0, 72 "duration": 3.0,
73 "properties": [{ 73 "properties": [{
74 "actor": "greeting2", // referenced actors must exist on stage 74 "actor": "greeting2", // referenced actors must exist on stage
75 "path":"path0", 75 "path":"path0",
76 "forward":[1,0,0], 76 "forward":[1,0,0],
77 - "alpha-function": "EASE_IN_OUT",  
78 - "time-period": { 77 + "alphaFunction": "EASE_IN_OUT",
  78 + "timePeriod": {
79 "delay": 0, 79 "delay": 0,
80 "duration": 3 80 "duration": 3
81 } 81 }
@@ -87,7 +87,7 @@ @@ -87,7 +87,7 @@
87 "name": "greeting", 87 "name": "greeting",
88 "type": "TextLabel", 88 "type": "TextLabel",
89 "text": "Touch me", 89 "text": "Touch me",
90 - "styles": ["basic-text"], 90 + "styles": ["basicText"],
91 "position": [0, -120, 0], 91 "position": [0, -120, 0],
92 "size": [200, 200, 1], 92 "size": [200, 200, 1],
93 "orientation": [0, 0, 30], 93 "orientation": [0, 0, 30],
@@ -99,8 +99,8 @@ @@ -99,8 +99,8 @@
99 }, { 99 }, {
100 "name":"greeting2", 100 "name":"greeting2",
101 "type": "TextLabel", 101 "type": "TextLabel",
102 - "parent-origin": "CENTER",  
103 - "anchor-point": "CENTER", 102 + "parentOrigin": "CENTER",
  103 + "anchorPoint": "CENTER",
104 "size": [200, 200, 1], 104 "size": [200, 200, 1],
105 "orientation": [0, 0, 39], 105 "orientation": [0, 0, 39],
106 "position": [-150, -50, 0], 106 "position": [-150, -50, 0],
@@ -108,12 +108,12 @@ @@ -108,12 +108,12 @@
108 "signals": [{ 108 "signals": [{
109 "name": "touched", 109 "name": "touched",
110 "action": "play", 110 "action": "play",
111 - "animation": "path-animation" 111 + "animation": "pathAnimation"
112 }] 112 }]
113 }, { 113 }, {
114 "type": "TextLabel", // styles can be additive 114 "type": "TextLabel", // styles can be additive
115 - "parent-origin": "CENTER",  
116 - "anchor-point": "CENTER", 115 + "parentOrigin": "CENTER",
  116 + "anchorPoint": "CENTER",
117 "size": [200, 200, 1], 117 "size": [200, 200, 1],
118 "text": "or the image.." 118 "text": "or the image.."
119 }, { 119 }, {
@@ -122,7 +122,7 @@ @@ -122,7 +122,7 @@
122 "image": { 122 "image": {
123 "filename": "{DALI_IMAGE_DIR}gallery-large-21.jpg" 123 "filename": "{DALI_IMAGE_DIR}gallery-large-21.jpg"
124 }, 124 },
125 - "relayout-enabled": false, 125 + "relayoutEnabled": false,
126 "position": [0, 200, 0], 126 "position": [0, 200, 0],
127 "size": [200, 200, 1], 127 "size": [200, 200, 1],
128 "signals": [{ 128 "signals": [{
@@ -130,6 +130,6 @@ @@ -130,6 +130,6 @@
130 "action": "play", 130 "action": "play",
131 "animation": "rotate" 131 "animation": "rotate"
132 }], 132 }],
133 - "position-inheritance": "DONT_INHERIT_POSITION" 133 + "positionInheritance": "DONT_INHERIT_POSITION"
134 }] 134 }]
135 } 135 }
resources/scripts/background-color.json
  View file @bee0766
@@ -19,12 +19,12 @@ @@ -19,12 +19,12 @@
19 // A TextLabel with a red background 19 // A TextLabel with a red background
20 { 20 {
21 "type": "TextLabel", 21 "type": "TextLabel",
22 - "draw-mode": "OVERLAY_2D", 22 + "drawMode": "OVERLAY_2D",
23 "text": "Hello World", 23 "text": "Hello World",
24 - "parent-origin": "TOP_CENTER",  
25 - "anchor-point": "TOP_CENTER", 24 + "parentOrigin": "TOP_CENTER",
  25 + "anchorPoint": "TOP_CENTER",
26 "position": [0, 50, 0], 26 "position": [0, 50, 0],
27 - "point-size": 40, 27 + "pointSize": 40,
28 "size": [400, 150, 1], 28 "size": [400, 150, 1],
29 "background":{ 29 "background":{
30 "color": [1, 0, 0, 1] 30 "color": [1, 0, 0, 1]
@@ -34,9 +34,9 @@ @@ -34,9 +34,9 @@
34 // A container with a yellow background 34 // A container with a yellow background
35 { 35 {
36 "type": "Control", 36 "type": "Control",
37 - "relayout-enabled": false,  
38 - "parent-origin": "CENTER",  
39 - "anchor-point": "BOTTOM_CENTER", 37 + "relayoutEnabled": false,
  38 + "parentOrigin": "CENTER",
  39 + "anchorPoint": "BOTTOM_CENTER",
40 "size": [400, 150, 1], 40 "size": [400, 150, 1],
41 "background":{ 41 "background":{
42 "color": [1, 1, 0, 1] 42 "color": [1, 1, 0, 1]
@@ -46,9 +46,9 @@ @@ -46,9 +46,9 @@
46 // A container with an image 46 // A container with an image
47 { 47 {
48 "type": "Control", 48 "type": "Control",
49 - "relayout-enabled": false,  
50 - "parent-origin": "CENTER",  
51 - "anchor-point": "TOP_CENTER", 49 + "relayoutEnabled": false,
  50 + "parentOrigin": "CENTER",
  51 + "anchorPoint": "TOP_CENTER",
52 "size": [400, 150, 1], 52 "size": [400, 150, 1],
53 "background": { 53 "background": {
54 "filename": "{DALI_IMAGE_DIR}button-background.png" 54 "filename": "{DALI_IMAGE_DIR}button-background.png"
@@ -58,9 +58,9 @@ @@ -58,9 +58,9 @@
58 // A container with the same image blended in with a blue background 58 // A container with the same image blended in with a blue background
59 { 59 {
60 "type": "Control", 60 "type": "Control",
61 - "relayout-enabled": false,  
62 - "parent-origin": "BOTTOM_CENTER",  
63 - "anchor-point": "BOTTOM_CENTER", 61 + "relayoutEnabled": false,
  62 + "parentOrigin": "BOTTOM_CENTER",
  63 + "anchorPoint": "BOTTOM_CENTER",
64 "size": [400, 150, 1], 64 "size": [400, 150, 1],
65 "background": { 65 "background": {
66 "filename": "{DALI_IMAGE_DIR}button-background.png" 66 "filename": "{DALI_IMAGE_DIR}button-background.png"
resources/scripts/button.json
  View file @bee0766
@@ -22,46 +22,46 @@ @@ -22,46 +22,46 @@
22 // First Button 22 // First Button
23 { 23 {
24 "type": "PushButton", 24 "type": "PushButton",
25 - "parent-origin": "TOP_CENTER",  
26 - "anchor-point": "TOP_CENTER", 25 + "parentOrigin": "TOP_CENTER",
  26 + "anchorPoint": "TOP_CENTER",
27 "position": [0, 0, 0], 27 "position": [0, 0, 0],
28 "size": [400, 200, 0], 28 "size": [400, 200, 0],
29 - "unselected-state-image": "{DALI_IMAGE_DIR}blocks-brick-1.png",  
30 - "selected-state-image": "{DALI_IMAGE_DIR}blocks-brick-2.png",  
31 - "label-text": "Normal" 29 + "unselectedStateImage": "{DALI_IMAGE_DIR}blocks-brick-1.png",
  30 + "selectedStateImage": "{DALI_IMAGE_DIR}blocks-brick-2.png",
  31 + "labelText": "Normal"
32 }, 32 },
33 33
34 // Second Button 34 // Second Button
35 { 35 {
36 "type": "PushButton", 36 "type": "PushButton",
37 - "parent-origin": "CENTER",  
38 - "anchor-point": "CENTER", 37 + "parentOrigin": "CENTER",
  38 + "anchorPoint": "CENTER",
39 "position": [0, 0, 0], 39 "position": [0, 0, 0],
40 "size": [400, 200, 0], 40 "size": [400, 200, 0],
41 "disabled": true, 41 "disabled": true,
42 - "unselected-state-image": "{DALI_IMAGE_DIR}blocks-brick-1.png",  
43 - "selected-state-image": "{DALI_IMAGE_DIR}blocks-brick-2.png",  
44 - "disabled-state-image": "{DALI_IMAGE_DIR}blocks-brick-3.png",  
45 - "label-text": "Disabled" 42 + "unselectedStateImage": "{DALI_IMAGE_DIR}blocks-brick-1.png",
  43 + "selectedStateImage": "{DALI_IMAGE_DIR}blocks-brick-2.png",
  44 + "disabledStateImage": "{DALI_IMAGE_DIR}blocks-brick-3.png",
  45 + "labelText": "Disabled"
46 }, 46 },
47 47
48 // Third Button 48 // Third Button
49 { 49 {
50 "type": "PushButton", 50 "type": "PushButton",
51 - "name": "toggle-button",  
52 - "parent-origin": "BOTTOM_CENTER",  
53 - "anchor-point": "BOTTOM_CENTER", 51 + "name": "toggleButton",
  52 + "parentOrigin": "BOTTOM_CENTER",
  53 + "anchorPoint": "BOTTOM_CENTER",
54 "position": [0, 0, 0], 54 "position": [0, 0, 0],
55 "size": [400, 200, 0], 55 "size": [400, 200, 0],
56 "togglable": true, 56 "togglable": true,
57 - "unselected-state-image": "{DALI_IMAGE_DIR}blocks-brick-1.png",  
58 - "selected-state-image": "{DALI_IMAGE_DIR}blocks-brick-3.png",  
59 - "label-text": "Toggle", 57 + "unselectedStateImage": "{DALI_IMAGE_DIR}blocks-brick-1.png",
  58 + "selectedStateImage": "{DALI_IMAGE_DIR}blocks-brick-3.png",
  59 + "labelText": "Toggle",
60 "signals": [{ 60 "signals": [{
61 "name": "selected", 61 "name": "selected",
62 "action": "set", 62 "action": "set",
63 - "actor": "toggle-button",  
64 - "property": "label-actor", 63 + "actor": "toggleButton",
  64 + "property": "labelActor",
65 "value": { 65 "value": {
66 "type": "TextLabel", 66 "type": "TextLabel",
67 "text": "Using a 9-patch image" 67 "text": "Using a 9-patch image"
resources/scripts/choreography.json
  View file @bee0766
1 { 1 {
2 "templates": 2 "templates":
3 { 3 {
4 - "circle-control": 4 + "circleControl":
5 { 5 {
6 "type": "ImageActor", 6 "type": "ImageActor",
7 - "inherit-position": true, 7 + "inheritPosition": true,
8 "size": [ 8 "size": [
9 70, 9 70,
10 70, 10 70,
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 "filename": "{DALI_IMAGE_DIR}circle.png" 20 "filename": "{DALI_IMAGE_DIR}circle.png"
21 } 21 }
22 }, 22 },
23 - "rectangle-control": 23 + "rectangleControl":
24 { 24 {
25 "type": "Control", 25 "type": "Control",
26 "size": [ 26 "size": [
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 1 29 1
30 ], 30 ],
31 "background": {"color": [0.95, 0.41, 0.18, 1] }, 31 "background": {"color": [0.95, 0.41, 0.18, 1] },
32 - "color-alpha": 0 32 + "colorAlpha": 0
33 } 33 }
34 }, 34 },
35 "stage": [ 35 "stage": [
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
42 105, 42 105,
43 0 43 0
44 ], 44 ],
45 - "inherit-position": true, 45 + "inheritPosition": true,
46 "size": [ 46 "size": [
47 20, 47 20,
48 20, 48 20,
@@ -50,10 +50,10 @@ @@ -50,10 +50,10 @@
50 ], 50 ],
51 "sizeAspectRatio": false, 51 "sizeAspectRatio": false,
52 "background": { "color": [0.85, 0.75, 0.45, 1] }, 52 "background": { "color": [0.85, 0.75, 0.45, 1] },
53 - "color-alpha": 0 53 + "colorAlpha": 0
54 }, 54 },
55 { 55 {
56 - "type": "circle-control", 56 + "type": "circleControl",
57 "name": "Circle1", 57 "name": "Circle1",
58 "position": [ 58 "position": [
59 84, 59 84,
@@ -69,7 +69,7 @@ @@ -69,7 +69,7 @@
69 ] 69 ]
70 }, 70 },
71 { 71 {
72 - "type": "circle-control", 72 + "type": "circleControl",
73 "name": "Circle2", 73 "name": "Circle2",
74 "position": [ 74 "position": [
75 151, 75 151,
@@ -78,7 +78,7 @@ @@ -78,7 +78,7 @@
78 ] 78 ]
79 }, 79 },
80 { 80 {
81 - "type": "circle-control", 81 + "type": "circleControl",
82 "name": "Circle3", 82 "name": "Circle3",
83 "position": [ 83 "position": [
84 285, 84 285,
@@ -87,7 +87,7 @@ @@ -87,7 +87,7 @@
87 ] 87 ]
88 }, 88 },
89 { 89 {
90 - "type": "circle-control", 90 + "type": "circleControl",
91 "name": "Circle4", 91 "name": "Circle4",
92 "position": [ 92 "position": [
93 218, 93 218,
@@ -96,7 +96,7 @@ @@ -96,7 +96,7 @@
96 ] 96 ]
97 }, 97 },
98 { 98 {
99 - "type": "rectangle-control", 99 + "type": "rectangleControl",
100 "name": "Rect1", 100 "name": "Rect1",
101 "position": [ 101 "position": [
102 50, 102 50,
@@ -105,7 +105,7 @@ @@ -105,7 +105,7 @@
105 ] 105 ]
106 }, 106 },
107 { 107 {
108 - "type": "rectangle-control", 108 + "type": "rectangleControl",
109 "name": "Rect2", 109 "name": "Rect2",
110 "position": [ 110 "position": [
111 120, 111 120,
@@ -114,7 +114,7 @@ @@ -114,7 +114,7 @@
114 ] 114 ]
115 }, 115 },
116 { 116 {
117 - "type": "rectangle-control", 117 + "type": "rectangleControl",
118 "name": "Rect3", 118 "name": "Rect3",
119 "position": [ 119 "position": [
120 190, 120 190,
@@ -123,7 +123,7 @@ @@ -123,7 +123,7 @@
123 ] 123 ]
124 }, 124 },
125 { 125 {
126 - "type": "rectangle-control", 126 + "type": "rectangleControl",
127 "name": "Rect4", 127 "name": "Rect4",
128 "position": [ 128 "position": [
129 260, 129 260,
@@ -143,8 +143,8 @@ @@ -143,8 +143,8 @@
143 198, 143 198,
144 -1 144 -1
145 ], 145 ],
146 - "alpha-function": "LINEAR",  
147 - "time-period": { 146 + "alphaFunction": "LINEAR",
  147 + "timePeriod": {
148 "delay": 0, 148 "delay": 0,
149 "duration": 0.025 149 "duration": 0.025
150 }, 150 },
@@ -158,8 +158,8 @@ @@ -158,8 +158,8 @@
158 190, 158 190,
159 -1 159 -1
160 ], 160 ],
161 - "alpha-function": "LINEAR",  
162 - "time-period": { 161 + "alphaFunction": "LINEAR",
  162 + "timePeriod": {
163 "delay": 0, 163 "delay": 0,
164 "duration": 0.05 164 "duration": 0.05
165 }, 165 },
@@ -173,8 +173,8 @@ @@ -173,8 +173,8 @@
173 170, 173 170,
174 -1 174 -1
175 ], 175 ],
176 - "alpha-function": "LINEAR",  
177 - "time-period": { 176 + "alphaFunction": "LINEAR",
  177 + "timePeriod": {
178 "delay": 0.05, 178 "delay": 0.05,
179 "duration": 0.05 179 "duration": 0.05
180 }, 180 },
@@ -188,8 +188,8 @@ @@ -188,8 +188,8 @@
188 150, 188 150,
189 -1 189 -1
190 ], 190 ],
191 - "alpha-function": "LINEAR",  
192 - "time-period": { 191 + "alphaFunction": "LINEAR",
  192 + "timePeriod": {
193 "delay": 0.1, 193 "delay": 0.1,
194 "duration": 0.051 194 "duration": 0.051
195 }, 195 },
@@ -203,8 +203,8 @@ @@ -203,8 +203,8 @@
203 125, 203 125,
204 -1 204 -1
205 ], 205 ],
206 - "alpha-function": "LINEAR",  
207 - "time-period": { 206 + "alphaFunction": "LINEAR",
  207 + "timePeriod": {
208 "delay": 0.151, 208 "delay": 0.151,
209 "duration": 0.049 209 "duration": 0.049
210 }, 210 },
@@ -218,8 +218,8 @@ @@ -218,8 +218,8 @@
218 100, 218 100,
219 -1 219 -1
220 ], 220 ],
221 - "alpha-function": "LINEAR",  
222 - "time-period": { 221 + "alphaFunction": "LINEAR",
  222 + "timePeriod": {
223 "delay": 0.2, 223 "delay": 0.2,
224 "duration": 0.051 224 "duration": 0.051
225 }, 225 },
@@ -233,8 +233,8 @@ @@ -233,8 +233,8 @@
233 70, 233 70,
234 1 234 1
235 ], 235 ],
236 - "alpha-function": "LINEAR",  
237 - "time-period": { 236 + "alphaFunction": "LINEAR",
  237 + "timePeriod": {
238 "delay": 0, 238 "delay": 0,
239 "duration": 0.025 239 "duration": 0.025
240 }, 240 },
@@ -248,8 +248,8 @@ @@ -248,8 +248,8 @@
248 20, 248 20,
249 1 249 1
250 ], 250 ],
251 - "alpha-function": "LINEAR",  
252 - "time-period": { 251 + "alphaFunction": "LINEAR",
  252 + "timePeriod": {
253 "delay": 0.151, 253 "delay": 0.151,
254 "duration": 0.1 254 "duration": 0.1
255 }, 255 },
@@ -263,8 +263,8 @@ @@ -263,8 +263,8 @@
263 1, 263 1,
264 1 264 1
265 ], 265 ],
266 - "alpha-function": "LINEAR",  
267 - "time-period": { 266 + "alphaFunction": "LINEAR",
  267 + "timePeriod": {
268 "delay": 0, 268 "delay": 0,
269 "duration": 0.025 269 "duration": 0.025
270 }, 270 },
@@ -278,8 +278,8 @@ @@ -278,8 +278,8 @@
278 0.1, 278 0.1,
279 1 279 1
280 ], 280 ],
281 - "alpha-function": "LINEAR",  
282 - "time-period": { 281 + "alphaFunction": "LINEAR",
  282 + "timePeriod": {
283 "delay": 0, 283 "delay": 0,
284 "duration": 0.325 284 "duration": 0.325
285 }, 285 },
@@ -293,8 +293,8 @@ @@ -293,8 +293,8 @@
293 1, 293 1,
294 1 294 1
295 ], 295 ],
296 - "alpha-function": "LINEAR",  
297 - "time-period": { 296 + "alphaFunction": "LINEAR",
  297 + "timePeriod": {
298 "delay": 0, 298 "delay": 0,
299 "duration": 0.025 299 "duration": 0.025
300 }, 300 },
@@ -308,8 +308,8 @@ @@ -308,8 +308,8 @@
308 0.1, 308 0.1,
309 1 309 1
310 ], 310 ],
311 - "alpha-function": "LINEAR",  
312 - "time-period": { 311 + "alphaFunction": "LINEAR",
  312 + "timePeriod": {
313 "delay": 0.049, 313 "delay": 0.049,
314 "duration": 0.301 314 "duration": 0.301
315 }, 315 },
@@ -323,8 +323,8 @@ @@ -323,8 +323,8 @@
323 1, 323 1,
324 1 324 1
325 ], 325 ],
326 - "alpha-function": "LINEAR",  
327 - "time-period": { 326 + "alphaFunction": "LINEAR",
  327 + "timePeriod": {
328 "delay": 0, 328 "delay": 0,
329 "duration": 0.025 329 "duration": 0.025
330 }, 330 },
@@ -338,8 +338,8 @@ @@ -338,8 +338,8 @@
338 0.1, 338 0.1,
339 1 339 1
340 ], 340 ],
341 - "alpha-function": "LINEAR",  
342 - "time-period": { 341 + "alphaFunction": "LINEAR",
  342 + "timePeriod": {
343 "delay": 0.1, 343 "delay": 0.1,
344 "duration": 0.272 344 "duration": 0.272
345 }, 345 },
@@ -353,8 +353,8 @@ @@ -353,8 +353,8 @@
353 20, 353 20,
354 1 354 1
355 ], 355 ],
356 - "alpha-function": "LINEAR",  
357 - "time-period": { 356 + "alphaFunction": "LINEAR",
  357 + "timePeriod": {
358 "delay": 0, 358 "delay": 0,
359 "duration": 0.025 359 "duration": 0.025
360 }, 360 },
@@ -368,8 +368,8 @@ @@ -368,8 +368,8 @@
368 210, 368 210,
369 1 369 1
370 ], 370 ],
371 - "alpha-function": "LINEAR",  
372 - "time-period": { 371 + "alphaFunction": "LINEAR",
  372 + "timePeriod": {
373 "delay": 0.227, 373 "delay": 0.227,
374 "duration": 0.122 374 "duration": 0.122
375 }, 375 },
@@ -377,10 +377,10 @@ @@ -377,10 +377,10 @@
377 }, 377 },
378 { 378 {
379 "actor": "topContainer", 379 "actor": "topContainer",
380 - "property": "color-alpha", 380 + "property": "colorAlpha",
381 "value": 0, 381 "value": 0,
382 - "alpha-function": "LINEAR",  
383 - "time-period": { 382 + "alphaFunction": "LINEAR",
  383 + "timePeriod": {
384 "delay": 0, 384 "delay": 0,
385 "duration": 0.025 385 "duration": 0.025
386 }, 386 },
@@ -388,10 +388,10 @@ @@ -388,10 +388,10 @@
388 }, 388 },
389 { 389 {
390 "actor": "topContainer", 390 "actor": "topContainer",
391 - "property": "color-alpha", 391 + "property": "colorAlpha",
392 "value": 1, 392 "value": 1,
393 - "alpha-function": "LINEAR",  
394 - "time-period": { 393 + "alphaFunction": "LINEAR",
  394 + "timePeriod": {
395 "delay": 0.101, 395 "delay": 0.101,
396 "duration": 0.249 396 "duration": 0.249
397 }, 397 },
@@ -405,8 +405,8 @@ @@ -405,8 +405,8 @@
405 280, 405 280,
406 0 406 0
407 ], 407 ],
408 - "alpha-function": "LINEAR",  
409 - "time-period": { 408 + "alphaFunction": "LINEAR",
  409 + "timePeriod": {
410 "delay": 0.1, 410 "delay": 0.1,
411 "duration": 0.075 411 "duration": 0.075
412 }, 412 },
@@ -420,8 +420,8 @@ @@ -420,8 +420,8 @@
420 260, 420 260,
421 0 421 0
422 ], 422 ],
423 - "alpha-function": "LINEAR",  
424 - "time-period": { 423 + "alphaFunction": "LINEAR",
  424 + "timePeriod": {
425 "delay": 0.175, 425 "delay": 0.175,
426 "duration": 0.075 426 "duration": 0.075
427 }, 427 },
@@ -435,8 +435,8 @@ @@ -435,8 +435,8 @@
435 250, 435 250,
436 0 436 0
437 ], 437 ],
438 - "alpha-function": "LINEAR",  
439 - "time-period": { 438 + "alphaFunction": "LINEAR",
  439 + "timePeriod": {
440 "delay": 0.25, 440 "delay": 0.25,
441 "duration": 0.075 441 "duration": 0.075
442 }, 442 },
@@ -444,10 +444,10 @@ @@ -444,10 +444,10 @@
444 }, 444 },
445 { 445 {
446 "actor": "Rect1", 446 "actor": "Rect1",
447 - "property": "color-alpha", 447 + "property": "colorAlpha",
448 "value": 0, 448 "value": 0,
449 - "alpha-function": "LINEAR",  
450 - "time-period": { 449 + "alphaFunction": "LINEAR",
  450 + "timePeriod": {
451 "delay": 0, 451 "delay": 0,
452 "duration": 0.025 452 "duration": 0.025
453 }, 453 },
@@ -455,10 +455,10 @@ @@ -455,10 +455,10 @@
455 }, 455 },
456 { 456 {
457 "actor": "Rect1", 457 "actor": "Rect1",
458 - "property": "color-alpha", 458 + "property": "colorAlpha",
459 "value": 1, 459 "value": 1,
460 - "alpha-function": "LINEAR",  
461 - "time-period": { 460 + "alphaFunction": "LINEAR",
  461 + "timePeriod": {
462 "delay": 0, 462 "delay": 0,
463 "duration": 0.325 463 "duration": 0.325
464 }, 464 },
@@ -472,8 +472,8 @@ @@ -472,8 +472,8 @@
472 280, 472 280,
473 0 473 0
474 ], 474 ],
475 - "alpha-function": "LINEAR",  
476 - "time-period": { 475 + "alphaFunction": "LINEAR",
  476 + "timePeriod": {
477 "delay": 0.148, 477 "delay": 0.148,
478 "duration": 0.077 478 "duration": 0.077
479 }, 479 },
@@ -487,8 +487,8 @@ @@ -487,8 +487,8 @@
487 260, 487 260,
488 0 488 0
489 ], 489 ],
490 - "alpha-function": "LINEAR",  
491 - "time-period": { 490 + "alphaFunction": "LINEAR",
  491 + "timePeriod": {
492 "delay": 0.225, 492 "delay": 0.225,
493 "duration": 0.075 493 "duration": 0.075
494 }, 494 },
@@ -502,8 +502,8 @@ @@ -502,8 +502,8 @@
502 250, 502 250,
503 0 503 0
504 ], 504 ],
505 - "alpha-function": "LINEAR",  
506 - "time-period": { 505 + "alphaFunction": "LINEAR",
  506 + "timePeriod": {
507 "delay": 0.3, 507 "delay": 0.3,
508 "duration": 0.072 508 "duration": 0.072
509 }, 509 },
@@ -511,10 +511,10 @@ @@ -511,10 +511,10 @@
511 }, 511 },
512 { 512 {
513 "actor": "Rect2", 513 "actor": "Rect2",
514 - "property": "color-alpha", 514 + "property": "colorAlpha",
515 "value": 0, 515 "value": 0,
516 - "alpha-function": "LINEAR",  
517 - "time-period": { 516 + "alphaFunction": "LINEAR",
  517 + "timePeriod": {
518 "delay": 0, 518 "delay": 0,
519 "duration": 0.025 519 "duration": 0.025
520 }, 520 },
@@ -522,10 +522,10 @@ @@ -522,10 +522,10 @@
522 }, 522 },
523 { 523 {
524 "actor": "Rect2", 524 "actor": "Rect2",
525 - "property": "color-alpha", 525 + "property": "colorAlpha",
526 "value": 1, 526 "value": 1,
527 - "alpha-function": "LINEAR",  
528 - "time-period": { 527 + "alphaFunction": "LINEAR",
  528 + "timePeriod": {
529 "delay": 0.05, 529 "delay": 0.05,
530 "duration": 0.322 530 "duration": 0.322
531 }, 531 },
@@ -539,8 +539,8 @@ @@ -539,8 +539,8 @@
539 280, 539 280,
540 0 540 0
541 ], 541 ],
542 - "alpha-function": "LINEAR",  
543 - "time-period": { 542 + "alphaFunction": "LINEAR",
  543 + "timePeriod": {
544 "delay": 0.2, 544 "delay": 0.2,
545 "duration": 0.074 545 "duration": 0.074
546 }, 546 },
@@ -554,8 +554,8 @@ @@ -554,8 +554,8 @@
554 260, 554 260,
555 0 555 0
556 ], 556 ],
557 - "alpha-function": "LINEAR",  
558 - "time-period": { 557 + "alphaFunction": "LINEAR",
  558 + "timePeriod": {
559 "delay": 0.274, 559 "delay": 0.274,
560 "duration": 0.073 560 "duration": 0.073
561 }, 561 },
@@ -569,8 +569,8 @@ @@ -569,8 +569,8 @@
569 250, 569 250,
570 0 570 0
571 ], 571 ],
572 - "alpha-function": "LINEAR",  
573 - "time-period": { 572 + "alphaFunction": "LINEAR",
  573 + "timePeriod": {
574 "delay": 0.347, 574 "delay": 0.347,
575 "duration": 0.078 575 "duration": 0.078
576 }, 576 },
@@ -578,10 +578,10 @@ @@ -578,10 +578,10 @@
578 }, 578 },
579 { 579 {
580 "actor": "Rect3", 580 "actor": "Rect3",
581 - "property": "color-alpha", 581 + "property": "colorAlpha",
582 "value": 0, 582 "value": 0,
583 - "alpha-function": "LINEAR",  
584 - "time-period": { 583 + "alphaFunction": "LINEAR",
  584 + "timePeriod": {
585 "delay": 0, 585 "delay": 0,
586 "duration": 0.025 586 "duration": 0.025
587 }, 587 },
@@ -589,10 +589,10 @@ @@ -589,10 +589,10 @@
589 }, 589 },
590 { 590 {
591 "actor": "Rect3", 591 "actor": "Rect3",
592 - "property": "color-alpha", 592 + "property": "colorAlpha",
593 "value": 1, 593 "value": 1,
594 - "alpha-function": "LINEAR",  
595 - "time-period": { 594 + "alphaFunction": "LINEAR",
  595 + "timePeriod": {
596 "delay": 0.099, 596 "delay": 0.099,
597 "duration": 0.326 597 "duration": 0.326
598 }, 598 },
@@ -606,8 +606,8 @@ @@ -606,8 +606,8 @@
606 280, 606 280,
607 0 607 0
608 ], 608 ],
609 - "alpha-function": "LINEAR",  
610 - "time-period": { 609 + "alphaFunction": "LINEAR",
  610 + "timePeriod": {
611 "delay": 0.251, 611 "delay": 0.251,
612 "duration": 0.075 612 "duration": 0.075
613 }, 613 },
@@ -621,8 +621,8 @@ @@ -621,8 +621,8 @@
621 260, 621 260,
622 0 622 0
623 ], 623 ],
624 - "alpha-function": "LINEAR",  
625 - "time-period": { 624 + "alphaFunction": "LINEAR",
  625 + "timePeriod": {
626 "delay": 0.326, 626 "delay": 0.326,
627 "duration": 0.074 627 "duration": 0.074
628 }, 628 },
@@ -636,8 +636,8 @@ @@ -636,8 +636,8 @@
636 250, 636 250,
637 0 637 0
638 ], 638 ],
639 - "alpha-function": "LINEAR",  
640 - "time-period": { 639 + "alphaFunction": "LINEAR",
  640 + "timePeriod": {
641 "delay": 0.4, 641 "delay": 0.4,
642 "duration": 0.075 642 "duration": 0.075
643 }, 643 },
@@ -645,10 +645,10 @@ @@ -645,10 +645,10 @@
645 }, 645 },
646 { 646 {
647 "actor": "Rect4", 647 "actor": "Rect4",
648 - "property": "color-alpha", 648 + "property": "colorAlpha",
649 "value": 0, 649 "value": 0,
650 - "alpha-function": "LINEAR",  
651 - "time-period": { 650 + "alphaFunction": "LINEAR",
  651 + "timePeriod": {
652 "delay": 0, 652 "delay": 0,
653 "duration": 0.025 653 "duration": 0.025
654 }, 654 },
@@ -656,10 +656,10 @@ @@ -656,10 +656,10 @@
656 }, 656 },
657 { 657 {
658 "actor": "Rect4", 658 "actor": "Rect4",
659 - "property": "color-alpha", 659 + "property": "colorAlpha",
660 "value": 1, 660 "value": 1,
661 - "alpha-function": "LINEAR",  
662 - "time-period": { 661 + "alphaFunction": "LINEAR",
  662 + "timePeriod": {
663 "delay": 0.148, 663 "delay": 0.148,
664 "duration": 0.327 664 "duration": 0.327
665 }, 665 },
resources/scripts/contacts.json
  View file @bee0766
@@ -3,9 +3,9 @@ @@ -3,9 +3,9 @@
3 { 3 {
4 "type": "Control", 4 "type": "Control",
5 "background": {"color": [ 1, 1, 1, 1 ]}, 5 "background": {"color": [ 1, 1, 1, 1 ]},
6 - "parent-origin": "TOP_LEFT",  
7 - "anchor-point": "TOP_LEFT",  
8 - "draw-mode": "STENCIL", 6 + "parentOrigin": "TOP_LEFT",
  7 + "anchorPoint": "TOP_LEFT",
  8 + "drawMode": "STENCIL",
9 "size": [ 360, 630, 0 ] 9 "size": [ 360, 630, 0 ]
10 }, 10 },
11 { 11 {
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 317, 17 317,
18 -1 18 -1
19 ], 19 ],
20 - "inherit-position": true, 20 + "inheritPosition": true,
21 "size": [ 21 "size": [
22 360, 22 360,
23 640, 23 640,
@@ -28,8 +28,8 @@ @@ -28,8 +28,8 @@
28 "filename": "{DALI_IMAGE_DIR}contacts-main.png", 28 "filename": "{DALI_IMAGE_DIR}contacts-main.png",
29 "width": 361, 29 "width": 361,
30 "height": 640, 30 "height": 640,
31 - "load-policy": "IMMEDIATE",  
32 - "release-policy": "NEVER" 31 + "loadPolicy": "IMMEDIATE",
  32 + "releasePolicy": "NEVER"
33 }, 33 },
34 "signals": [ 34 "signals": [
35 { 35 {
@@ -48,7 +48,7 @@ @@ -48,7 +48,7 @@
48 139, 48 139,
49 0 49 0
50 ], 50 ],
51 - "inherit-position": true, 51 + "inheritPosition": true,
52 "size": [ 52 "size": [
53 360, 53 360,
54 282, 54 282,
@@ -59,8 +59,8 @@ @@ -59,8 +59,8 @@
59 "filename": "{DALI_IMAGE_DIR}contacts-background.png", 59 "filename": "{DALI_IMAGE_DIR}contacts-background.png",
60 "width": 360, 60 "width": 360,
61 "height": 282, 61 "height": 282,
62 - "load-policy": "IMMEDIATE",  
63 - "release-policy": "NEVER" 62 + "loadPolicy": "IMMEDIATE",
  63 + "releasePolicy": "NEVER"
64 } 64 }
65 }, 65 },
66 { 66 {
@@ -72,7 +72,7 @@ @@ -72,7 +72,7 @@
72 824.0520479877184, 72 824.0520479877184,
73 0 73 0
74 ], 74 ],
75 - "inherit-position": true, 75 + "inheritPosition": true,
76 "size": [ 76 "size": [
77 393.04, 77 393.04,
78 378.08, 78 378.08,
@@ -96,7 +96,7 @@ @@ -96,7 +96,7 @@
96 402.004657366638, 96 402.004657366638,
97 1 97 1
98 ], 98 ],
99 - "inherit-position": true, 99 + "inheritPosition": true,
100 "size": [ 100 "size": [
101 53, 101 53,
102 52, 102 52,
@@ -107,8 +107,8 @@ @@ -107,8 +107,8 @@
107 "filename": "{DALI_IMAGE_DIR}contacts-image.png", 107 "filename": "{DALI_IMAGE_DIR}contacts-image.png",
108 "width": 53, 108 "width": 53,
109 "height": 52, 109 "height": 52,
110 - "load-policy": "IMMEDIATE",  
111 - "release-policy": "NEVER" 110 + "loadPolicy": "IMMEDIATE",
  111 + "releasePolicy": "NEVER"
112 } 112 }
113 }, 113 },
114 { 114 {
@@ -120,14 +120,14 @@ @@ -120,14 +120,14 @@
120 405, 120 405,
121 1 121 1
122 ], 122 ],
123 - "inherit-position": true, 123 + "inheritPosition": true,
124 "size": [ 124 "size": [
125 152.89, 125 152.89,
126 24.33, 126 24.33,
127 1 127 1
128 ], 128 ],
129 "sizeAspectRatio": false, 129 "sizeAspectRatio": false,
130 - "markup-enabled": true, 130 + "markupEnabled": true,
131 "color": [ 131 "color": [
132 0.2, 132 0.2,
133 0.2, 133 0.2,
@@ -147,7 +147,7 @@ @@ -147,7 +147,7 @@
147 611.5127067356418, 147 611.5127067356418,
148 1 148 1
149 ], 149 ],
150 - "inherit-position": true, 150 + "inheritPosition": true,
151 "size": [ 151 "size": [
152 80, 152 80,
153 71, 153 71,
@@ -158,8 +158,8 @@ @@ -158,8 +158,8 @@
158 "filename": "{DALI_IMAGE_DIR}contacts-add.png", 158 "filename": "{DALI_IMAGE_DIR}contacts-add.png",
159 "width": 80, 159 "width": 80,
160 "height": 71, 160 "height": 71,
161 - "load-policy": "IMMEDIATE",  
162 - "release-policy": "NEVER" 161 + "loadPolicy": "IMMEDIATE",
  162 + "releasePolicy": "NEVER"
163 } 163 }
164 }, 164 },
165 { 165 {
@@ -171,7 +171,7 @@ @@ -171,7 +171,7 @@
171 677.5051724136168, 171 677.5051724136168,
172 0 172 0
173 ], 173 ],
174 - "inherit-position": true, 174 + "inheritPosition": true,
175 "size": [ 175 "size": [
176 360, 176 360,
177 77, 177 77,
@@ -182,8 +182,8 @@ @@ -182,8 +182,8 @@
182 "filename": "{DALI_IMAGE_DIR}contacts-messenger.png", 182 "filename": "{DALI_IMAGE_DIR}contacts-messenger.png",
183 "width": 360, 183 "width": 360,
184 "height": 77, 184 "height": 77,
185 - "load-policy": "IMMEDIATE",  
186 - "release-policy": "NEVER" 185 + "loadPolicy": "IMMEDIATE",
  186 + "releasePolicy": "NEVER"
187 } 187 }
188 }, 188 },
189 { 189 {
@@ -195,7 +195,7 @@ @@ -195,7 +195,7 @@
195 704.5075140543304, 195 704.5075140543304,
196 0 196 0
197 ], 197 ],
198 - "inherit-position": true, 198 + "inheritPosition": true,
199 "size": [ 199 "size": [
200 360, 200 360,
201 79, 201 79,
@@ -206,8 +206,8 @@ @@ -206,8 +206,8 @@
206 "filename": "{DALI_IMAGE_DIR}contacts-email.png", 206 "filename": "{DALI_IMAGE_DIR}contacts-email.png",
207 "width": 360, 207 "width": 360,
208 "height": 79, 208 "height": 79,
209 - "load-policy": "IMMEDIATE",  
210 - "release-policy": "NEVER" 209 + "loadPolicy": "IMMEDIATE",
  210 + "releasePolicy": "NEVER"
211 } 211 }
212 }, 212 },
213 { 213 {
@@ -219,7 +219,7 @@ @@ -219,7 +219,7 @@
219 727.0088875903122, 219 727.0088875903122,
220 0 220 0
221 ], 221 ],
222 - "inherit-position": true, 222 + "inheritPosition": true,
223 "size": [ 223 "size": [
224 360, 224 360,
225 80, 225 80,
@@ -230,8 +230,8 @@ @@ -230,8 +230,8 @@
230 "filename": "{DALI_IMAGE_DIR}contacts-mobile.png", 230 "filename": "{DALI_IMAGE_DIR}contacts-mobile.png",
231 "width": 360, 231 "width": 360,
232 "height": 80, 232 "height": 80,
233 - "load-policy": "IMMEDIATE",  
234 - "release-policy": "NEVER" 233 + "loadPolicy": "IMMEDIATE",
  234 + "releasePolicy": "NEVER"
235 } 235 }
236 }, 236 },
237 { 237 {
@@ -243,7 +243,7 @@ @@ -243,7 +243,7 @@
243 749.5101801844454, 243 749.5101801844454,
244 0 244 0
245 ], 245 ],
246 - "inherit-position": true, 246 + "inheritPosition": true,
247 "size": [ 247 "size": [
248 360, 248 360,
249 75, 249 75,
@@ -254,8 +254,8 @@ @@ -254,8 +254,8 @@
254 "filename": "{DALI_IMAGE_DIR}contacts-home.png", 254 "filename": "{DALI_IMAGE_DIR}contacts-home.png",
255 "width": 360, 255 "width": 360,
256 "height": 75, 256 "height": 75,
257 - "load-policy": "IMMEDIATE",  
258 - "release-policy": "NEVER" 257 + "loadPolicy": "IMMEDIATE",
  258 + "releasePolicy": "NEVER"
259 } 259 }
260 }, 260 },
261 { 261 {
@@ -267,7 +267,7 @@ @@ -267,7 +267,7 @@
267 50.289953613295076, 267 50.289953613295076,
268 1 268 1
269 ], 269 ],
270 - "inherit-position": true, 270 + "inheritPosition": true,
271 "size": [ 271 "size": [
272 25, 272 25,
273 20.55, 273 20.55,
@@ -278,8 +278,8 @@ @@ -278,8 +278,8 @@
278 "filename": "{DALI_IMAGE_DIR}contacts-circle.png", 278 "filename": "{DALI_IMAGE_DIR}contacts-circle.png",
279 "width": 100, 279 "width": 100,
280 "height": 100, 280 "height": 100,
281 - "load-policy": "IMMEDIATE",  
282 - "release-policy": "NEVER" 281 + "loadPolicy": "IMMEDIATE",
  282 + "releasePolicy": "NEVER"
283 } 283 }
284 }, 284 },
285 { 285 {
@@ -291,7 +291,7 @@ @@ -291,7 +291,7 @@
291 817.499887599389, 291 817.499887599389,
292 0 292 0
293 ], 293 ],
294 - "inherit-position": true, 294 + "inheritPosition": true,
295 "size": [ 295 "size": [
296 360, 296 360,
297 77, 297 77,
@@ -302,8 +302,8 @@ @@ -302,8 +302,8 @@
302 "filename": "{DALI_IMAGE_DIR}contacts-plain.png", 302 "filename": "{DALI_IMAGE_DIR}contacts-plain.png",
303 "width": 360, 303 "width": 360,
304 "height": 77, 304 "height": 77,
305 - "load-policy": "IMMEDIATE",  
306 - "release-policy": "NEVER" 305 + "loadPolicy": "IMMEDIATE",
  306 + "releasePolicy": "NEVER"
307 } 307 }
308 }, 308 },
309 { 309 {
@@ -315,7 +315,7 @@ @@ -315,7 +315,7 @@
315 401.485, 315 401.485,
316 0 316 0
317 ], 317 ],
318 - "inherit-position": true, 318 + "inheritPosition": true,
319 "size": [ 319 "size": [
320 693.96, 320 693.96,
321 84.97, 321 84.97,
@@ -347,8 +347,8 @@ @@ -347,8 +347,8 @@
347 609.5059654033565, 347 609.5059654033565,
348 1 348 1
349 ], 349 ],
350 - "alpha-function": "LINEAR",  
351 - "time-period": { 350 + "alphaFunction": "LINEAR",
  351 + "timePeriod": {
352 "delay": 0.503, 352 "delay": 0.503,
353 "duration": 0.005 353 "duration": 0.005
354 }, 354 },
@@ -362,8 +362,8 @@ @@ -362,8 +362,8 @@
362 20, 362 20,
363 1 363 1
364 ], 364 ],
365 - "alpha-function": "LINEAR",  
366 - "time-period": { 365 + "alphaFunction": "LINEAR",
  366 + "timePeriod": {
367 "delay": 4.071, 367 "delay": 4.071,
368 "duration": 0.005 368 "duration": 0.005
369 }, 369 },
@@ -377,8 +377,8 @@ @@ -377,8 +377,8 @@
377 71, 377 71,
378 1 378 1
379 ], 379 ],
380 - "alpha-function": "LINEAR",  
381 - "time-period": { 380 + "alphaFunction": "LINEAR",
  381 + "timePeriod": {
382 "delay": 4.498, 382 "delay": 4.498,
383 "duration": 0.3 383 "duration": 0.3
384 }, 384 },
@@ -392,8 +392,8 @@ @@ -392,8 +392,8 @@
392 611.5150431968526, 392 611.5150431968526,
393 1 393 1
394 ], 394 ],
395 - "alpha-function": "LINEAR",  
396 - "time-period": { 395 + "alphaFunction": "LINEAR",
  396 + "timePeriod": {
397 "delay": 4.498, 397 "delay": 4.498,
398 "duration": 0.005 398 "duration": 0.005
399 }, 399 },
@@ -407,8 +407,8 @@ @@ -407,8 +407,8 @@
407 239.01, 407 239.01,
408 1 408 1
409 ], 409 ],
410 - "alpha-function": "LINEAR",  
411 - "time-period": { 410 + "alphaFunction": "LINEAR",
  411 + "timePeriod": {
412 "delay": 1.22, 412 "delay": 1.22,
413 "duration": 0.396 413 "duration": 0.396
414 }, 414 },
@@ -422,8 +422,8 @@ @@ -422,8 +422,8 @@
422 402, 422 402,
423 1 423 1
424 ], 424 ],
425 - "alpha-function": "LINEAR",  
426 - "time-period": { 425 + "alphaFunction": "LINEAR",
  426 + "timePeriod": {
427 "delay": 4.437, 427 "delay": 4.437,
428 "duration": 0.396 428 "duration": 0.396
429 }, 429 },
@@ -437,8 +437,8 @@ @@ -437,8 +437,8 @@
437 242, 437 242,
438 1 438 1
439 ], 439 ],
440 - "alpha-function": "LINEAR",  
441 - "time-period": { 440 + "alphaFunction": "LINEAR",
  441 + "timePeriod": {
442 "delay": 1.22, 442 "delay": 1.22,
443 "duration": 0.395 443 "duration": 0.395
444 }, 444 },
@@ -453,8 +453,8 @@ @@ -453,8 +453,8 @@
453 1, 453 1,
454 1 454 1
455 ], 455 ],
456 - "alpha-function": "LINEAR",  
457 - "time-period": { 456 + "alphaFunction": "LINEAR",
  457 + "timePeriod": {
458 "delay": 1.22, 458 "delay": 1.22,
459 "duration": 0.395 459 "duration": 0.395
460 }, 460 },
@@ -468,8 +468,8 @@ @@ -468,8 +468,8 @@
468 35.33, 468 35.33,
469 1 469 1
470 ], 470 ],
471 - "alpha-function": "LINEAR",  
472 - "time-period": { 471 + "alphaFunction": "LINEAR",
  472 + "timePeriod": {
473 "delay": 1.22, 473 "delay": 1.22,
474 "duration": 0.395 474 "duration": 0.395
475 }, 475 },
@@ -483,8 +483,8 @@ @@ -483,8 +483,8 @@
483 405, 483 405,
484 1 484 1
485 ], 485 ],
486 - "alpha-function": "LINEAR",  
487 - "time-period": { 486 + "alphaFunction": "LINEAR",
  487 + "timePeriod": {
488 "delay": 4.435, 488 "delay": 4.435,
489 "duration": 0.395 489 "duration": 0.395
490 }, 490 },
@@ -499,8 +499,8 @@ @@ -499,8 +499,8 @@
499 0.2, 499 0.2,
500 1 500 1
501 ], 501 ],
502 - "alpha-function": "LINEAR",  
503 - "time-period": { 502 + "alphaFunction": "LINEAR",
  503 + "timePeriod": {
504 "delay": 4.435, 504 "delay": 4.435,
505 "duration": 0.395 505 "duration": 0.395
506 }, 506 },
@@ -514,8 +514,8 @@ @@ -514,8 +514,8 @@
514 24.33, 514 24.33,
515 1 515 1
516 ], 516 ],
517 - "alpha-function": "LINEAR",  
518 - "time-period": { 517 + "alphaFunction": "LINEAR",
  518 + "timePeriod": {
519 "delay": 4.435, 519 "delay": 4.435,
520 "duration": 0.395 520 "duration": 0.395
521 }, 521 },
@@ -529,8 +529,8 @@ @@ -529,8 +529,8 @@
529 138.98, 529 138.98,
530 0 530 0
531 ], 531 ],
532 - "alpha-function": "LINEAR",  
533 - "time-period": { 532 + "alphaFunction": "LINEAR",
  533 + "timePeriod": {
534 "delay": 1.222, 534 "delay": 1.222,
535 "duration": 0.391 535 "duration": 0.391
536 }, 536 },
@@ -544,8 +544,8 @@ @@ -544,8 +544,8 @@
544 138.98, 544 138.98,
545 0 545 0
546 ], 546 ],
547 - "alpha-function": "LINEAR",  
548 - "time-period": { 547 + "alphaFunction": "LINEAR",
  548 + "timePeriod": {
549 "delay": 4.435, 549 "delay": 4.435,
550 "duration": 0.391 550 "duration": 0.391
551 }, 551 },
@@ -559,8 +559,8 @@ @@ -559,8 +559,8 @@
559 320.50795521899136, 559 320.50795521899136,
560 0 560 0
561 ], 561 ],
562 - "alpha-function": "LINEAR",  
563 - "time-period": { 562 + "alphaFunction": "LINEAR",
  563 + "timePeriod": {
564 "delay": 1.346, 564 "delay": 1.346,
565 "duration": 0.372 565 "duration": 0.372
566 }, 566 },
@@ -574,8 +574,8 @@ @@ -574,8 +574,8 @@
574 677.51, 574 677.51,
575 0 575 0
576 ], 576 ],
577 - "alpha-function": "LINEAR",  
578 - "time-period": { 577 + "alphaFunction": "LINEAR",
  578 + "timePeriod": {
579 "delay": 4.34, 579 "delay": 4.34,
580 "duration": 0.372 580 "duration": 0.372
581 }, 581 },
@@ -589,8 +589,8 @@ @@ -589,8 +589,8 @@
589 395.5, 589 395.5,
590 0 590 0
591 ], 591 ],
592 - "alpha-function": "LINEAR",  
593 - "time-period": { 592 + "alphaFunction": "LINEAR",
  593 + "timePeriod": {
594 "delay": 1.432, 594 "delay": 1.432,
595 "duration": 0.39 595 "duration": 0.39
596 }, 596 },
@@ -604,8 +604,8 @@ @@ -604,8 +604,8 @@
604 704.5, 604 704.5,
605 0 605 0
606 ], 606 ],
607 - "alpha-function": "LINEAR",  
608 - "time-period": { 607 + "alphaFunction": "LINEAR",
  608 + "timePeriod": {
609 "delay": 4.218, 609 "delay": 4.218,
610 "duration": 0.39 610 "duration": 0.39
611 }, 611 },
@@ -619,8 +619,8 @@ @@ -619,8 +619,8 @@
619 470.01, 619 470.01,
620 0 620 0
621 ], 621 ],
622 - "alpha-function": "LINEAR",  
623 - "time-period": { 622 + "alphaFunction": "LINEAR",
  623 + "timePeriod": {
624 "delay": 1.543, 624 "delay": 1.543,
625 "duration": 0.385 625 "duration": 0.385
626 }, 626 },
@@ -634,8 +634,8 @@ @@ -634,8 +634,8 @@
634 727.01, 634 727.01,
635 0 635 0
636 ], 636 ],
637 - "alpha-function": "LINEAR",  
638 - "time-period": { 637 + "alphaFunction": "LINEAR",
  638 + "timePeriod": {
639 "delay": 4.11, 639 "delay": 4.11,
640 "duration": 0.385 640 "duration": 0.385
641 }, 641 },
@@ -649,8 +649,8 @@ @@ -649,8 +649,8 @@
649 541.5, 649 541.5,
650 0 650 0
651 ], 651 ],
652 - "alpha-function": "LINEAR",  
653 - "time-period": { 652 + "alphaFunction": "LINEAR",
  653 + "timePeriod": {
654 "delay": 1.635, 654 "delay": 1.635,
655 "duration": 0.406 655 "duration": 0.406
656 }, 656 },
@@ -664,8 +664,8 @@ @@ -664,8 +664,8 @@
664 749.5, 664 749.5,
665 0 665 0
666 ], 666 ],
667 - "alpha-function": "LINEAR",  
668 - "time-period": { 667 + "alphaFunction": "LINEAR",
  668 + "timePeriod": {
669 "delay": 3.993, 669 "delay": 3.993,
670 "duration": 0.406 670 "duration": 0.406
671 }, 671 },
@@ -679,8 +679,8 @@ @@ -679,8 +679,8 @@
679 608.5139116202711, 679 608.5139116202711,
680 0 680 0
681 ], 681 ],
682 - "alpha-function": "LINEAR",  
683 - "time-period": { 682 + "alphaFunction": "LINEAR",
  683 + "timePeriod": {
684 "delay": 1.726, 684 "delay": 1.726,
685 "duration": 0.435 685 "duration": 0.435
686 }, 686 },
@@ -694,8 +694,8 @@ @@ -694,8 +694,8 @@
694 817.51, 694 817.51,
695 0 695 0
696 ], 696 ],
697 - "alpha-function": "LINEAR",  
698 - "time-period": { 697 + "alphaFunction": "LINEAR",
  698 + "timePeriod": {
699 "delay": 3.865, 699 "delay": 3.865,
700 "duration": 0.435 700 "duration": 0.435
701 }, 701 },
@@ -709,8 +709,8 @@ @@ -709,8 +709,8 @@
709 48.280475138643396, 709 48.280475138643396,
710 1 710 1
711 ], 711 ],
712 - "alpha-function": "LINEAR",  
713 - "time-period": { 712 + "alphaFunction": "LINEAR",
  713 + "timePeriod": {
714 "delay": 2.66, 714 "delay": 2.66,
715 "duration": 0.005 715 "duration": 0.005
716 }, 716 },
@@ -724,8 +724,8 @@ @@ -724,8 +724,8 @@
724 48.280475138643396, 724 48.280475138643396,
725 1 725 1
726 ], 726 ],
727 - "alpha-function": "LINEAR",  
728 - "time-period": { 727 + "alphaFunction": "LINEAR",
  728 + "timePeriod": {
729 "delay": 2.851, 729 "delay": 2.851,
730 "duration": 0.008 730 "duration": 0.008
731 }, 731 },
@@ -739,8 +739,8 @@ @@ -739,8 +739,8 @@
739 80, 739 80,
740 1 740 1
741 ], 741 ],
742 - "alpha-function": "LINEAR",  
743 - "time-period": { 742 + "alphaFunction": "LINEAR",
  743 + "timePeriod": {
744 "delay": 2.665, 744 "delay": 2.665,
745 "duration": 1.187 745 "duration": 1.187
746 }, 746 },
@@ -754,8 +754,8 @@ @@ -754,8 +754,8 @@
754 470.05397482417106, 754 470.05397482417106,
755 0 755 0
756 ], 756 ],
757 - "alpha-function": "LINEAR",  
758 - "time-period": { 757 + "alphaFunction": "LINEAR",
  758 + "timePeriod": {
759 "delay": 1.031, 759 "delay": 1.031,
760 "duration": 0.561 760 "duration": 0.561
761 }, 761 },
@@ -769,8 +769,8 @@ @@ -769,8 +769,8 @@
769 467.042499801712, 769 467.042499801712,
770 0 770 0
771 ], 771 ],
772 - "alpha-function": "LINEAR",  
773 - "time-period": { 772 + "alphaFunction": "LINEAR",
  773 + "timePeriod": {
774 "delay": 4.342, 774 "delay": 4.342,
775 "duration": 0.005 775 "duration": 0.005
776 }, 776 },
@@ -784,8 +784,8 @@ @@ -784,8 +784,8 @@
784 402.425, 784 402.425,
785 0 785 0
786 ], 786 ],
787 - "alpha-function": "LINEAR",  
788 - "time-period": { 787 + "alphaFunction": "LINEAR",
  788 + "timePeriod": {
789 "delay": 0, 789 "delay": 0,
790 "duration": 0.904 790 "duration": 0.904
791 }, 791 },
resources/scripts/gallery.json
  View file @bee0766
1 { 1 {
2 "templates": 2 "templates":
3 { 3 {
4 - "selection-type": 4 + "selectionType":
5 { 5 {
6 "type": "Control", 6 "type": "Control",
7 "background": {"color": [ 1, 0.5, 0, 0.6 ]}, 7 "background": {"color": [ 1, 0.5, 0, 0.6 ]},
8 - "color-alpha": 0.05,  
9 - "parent-origin": "CENTER",  
10 - "anchor-point": "CENTER", 8 + "colorAlpha": 0.05,
  9 + "parentOrigin": "CENTER",
  10 + "anchorPoint": "CENTER",
11 "size": [ 450, 90, 1 ] 11 "size": [ 450, 90, 1 ]
12 }, 12 },
13 - "image-type": 13 + "imageType":
14 { 14 {
15 "type": "ImageActor", 15 "type": "ImageActor",
16 "position": [ 450, 0, 1 ], 16 "position": [ 450, 0, 1 ],
17 - "parent-origin": "CENTER",  
18 - "anchor-point": "CENTER", 17 + "parentOrigin": "CENTER",
  18 + "anchorPoint": "CENTER",
19 "size": [ 450, 795, 1 ], 19 "size": [ 450, 795, 1 ],
20 "actors": [ 20 "actors": [
21 { 21 {
22 "type": "Control", 22 "type": "Control",
23 - "position-inheritance": "USE_PARENT_POSITION", 23 + "positionInheritance": "USE_PARENT_POSITION",
24 "size": [ 450, 795, 1 ], 24 "size": [ 450, 795, 1 ],
25 "signals": [ 25 "signals": [
26 { 26 {
@@ -38,18 +38,18 @@ @@ -38,18 +38,18 @@
38 "type": "Control", 38 "type": "Control",
39 "name": "stencil", 39 "name": "stencil",
40 "background": {"color": [ 1, 1, 1, 1 ]}, 40 "background": {"color": [ 1, 1, 1, 1 ]},
41 - "parent-origin": "CENTER",  
42 - "anchor-point": "CENTER",  
43 - "draw-mode": "STENCIL", 41 + "parentOrigin": "CENTER",
  42 + "anchorPoint": "CENTER",
  43 + "drawMode": "STENCIL",
44 "size": [ 450, 795, 0 ], 44 "size": [ 450, 795, 0 ],
45 - "position-z": 0.1 45 + "positionZ": 0.1
46 }, 46 },
47 { 47 {
48 "type": "ImageActor", 48 "type": "ImageActor",
49 "actors": [], 49 "actors": [],
50 "name": "list", 50 "name": "list",
51 - "parent-origin": "CENTER",  
52 - "anchor-point": "CENTER", 51 + "parentOrigin": "CENTER",
  52 + "anchorPoint": "CENTER",
53 "position": [ 0, 0, -1 ], 53 "position": [ 0, 0, -1 ],
54 "size": [ 450, 795, 1 ], 54 "size": [ 450, 795, 1 ],
55 "image": { 55 "image": {
@@ -57,9 +57,9 @@ @@ -57,9 +57,9 @@
57 } 57 }
58 }, 58 },
59 { 59 {
60 - "type": "selection-type",  
61 - "name": "selection-1",  
62 - "position-y": -105, 60 + "type": "selectionType",
  61 + "name": "selection1",
  62 + "positionY": -105,
63 "signals": [ 63 "signals": [
64 { 64 {
65 "name": "tapped", 65 "name": "tapped",
@@ -69,9 +69,9 @@ @@ -69,9 +69,9 @@
69 ] 69 ]
70 }, 70 },
71 { 71 {
72 - "type": "selection-type",  
73 - "name": "selection-2",  
74 - "position-y": -15, 72 + "type": "selectionType",
  73 + "name": "selection2",
  74 + "positionY": -15,
75 "signals": [ 75 "signals": [
76 { 76 {
77 "name": "tapped", 77 "name": "tapped",
@@ -81,9 +81,9 @@ @@ -81,9 +81,9 @@
81 ] 81 ]
82 }, 82 },
83 { 83 {
84 - "type": "selection-type",  
85 - "name": "selection-3",  
86 - "position-y": 75, 84 + "type": "selectionType",
  85 + "name": "selection3",
  86 + "positionY": 75,
87 "signals": [ 87 "signals": [
88 { 88 {
89 "name": "tapped", 89 "name": "tapped",
@@ -93,9 +93,9 @@ @@ -93,9 +93,9 @@
93 ] 93 ]
94 }, 94 },
95 { 95 {
96 - "type": "selection-type",  
97 - "name": "selection-4",  
98 - "position-y": 165, 96 + "type": "selectionType",
  97 + "name": "selection4",
  98 + "positionY": 165,
99 "signals": [ 99 "signals": [
100 { 100 {
101 "name": "tapped", 101 "name": "tapped",
@@ -105,9 +105,9 @@ @@ -105,9 +105,9 @@
105 ] 105 ]
106 }, 106 },
107 { 107 {
108 - "type": "selection-type",  
109 - "name": "selection-5",  
110 - "position-y": 255, 108 + "type": "selectionType",
  109 + "name": "selection5",
  110 + "positionY": 255,
111 "signals": [ 111 "signals": [
112 { 112 {
113 "name": "tapped", 113 "name": "tapped",
@@ -117,36 +117,36 @@ @@ -117,36 +117,36 @@
117 ] 117 ]
118 }, 118 },
119 { 119 {
120 - "type": "image-type",  
121 - "name": "picture-1", 120 + "type": "imageType",
  121 + "name": "picture1",
122 "image": { 122 "image": {
123 "filename": "{DALI_IMAGE_DIR}animation-picture-1.png" 123 "filename": "{DALI_IMAGE_DIR}animation-picture-1.png"
124 } 124 }
125 }, 125 },
126 { 126 {
127 - "type": "image-type",  
128 - "name": "picture-2", 127 + "type": "imageType",
  128 + "name": "picture2",
129 "image": { 129 "image": {
130 "filename": "{DALI_IMAGE_DIR}animation-picture-2.png" 130 "filename": "{DALI_IMAGE_DIR}animation-picture-2.png"
131 } 131 }
132 }, 132 },
133 { 133 {
134 - "type": "image-type",  
135 - "name": "picture-3", 134 + "type": "imageType",
  135 + "name": "picture3",
136 "image": { 136 "image": {
137 "filename": "{DALI_IMAGE_DIR}animation-picture-3.png" 137 "filename": "{DALI_IMAGE_DIR}animation-picture-3.png"
138 } 138 }
139 }, 139 },
140 { 140 {
141 - "type": "image-type",  
142 - "name": "picture-4", 141 + "type": "imageType",
  142 + "name": "picture4",
143 "image": { 143 "image": {
144 "filename": "{DALI_IMAGE_DIR}animation-picture-4.png" 144 "filename": "{DALI_IMAGE_DIR}animation-picture-4.png"
145 } 145 }
146 }, 146 },
147 { 147 {
148 - "type": "image-type",  
149 - "name": "picture-5", 148 + "type": "imageType",
  149 + "name": "picture5",
150 "image": { 150 "image": {
151 "filename": "{DALI_IMAGE_DIR}animation-picture-5.png" 151 "filename": "{DALI_IMAGE_DIR}animation-picture-5.png"
152 } 152 }
@@ -156,22 +156,22 @@ @@ -156,22 +156,22 @@
156 "Animation_1": { 156 "Animation_1": {
157 "properties": [ 157 "properties": [
158 { 158 {
159 - "actor": "selection-1",  
160 - "property": "color-alpha", 159 + "actor": "selection1",
  160 + "property": "colorAlpha",
161 "value": 0.5, 161 "value": 0.5,
162 - "alpha-function": "SIN",  
163 - "time-period": { 162 + "alphaFunction": "SIN",
  163 + "timePeriod": {
164 "delay": 0, 164 "delay": 0,
165 "duration": 0.5 165 "duration": 0.5
166 }, 166 },
167 "timelineColor": "#83bcc5" 167 "timelineColor": "#83bcc5"
168 }, 168 },
169 { 169 {
170 - "actor": "picture-1",  
171 - "property": "position-x", 170 + "actor": "picture1",
  171 + "property": "positionX",
172 "value": 0, 172 "value": 0,
173 - "alpha-function": "LINEAR",  
174 - "time-period": { 173 + "alphaFunction": "LINEAR",
  174 + "timePeriod": {
175 "delay": 0.25, 175 "delay": 0.25,
176 "duration": 0.25 176 "duration": 0.25
177 }, 177 },
@@ -182,22 +182,22 @@ @@ -182,22 +182,22 @@
182 "Animation_2": { 182 "Animation_2": {
183 "properties": [ 183 "properties": [
184 { 184 {
185 - "actor": "selection-2",  
186 - "property": "color-alpha", 185 + "actor": "selection2",
  186 + "property": "colorAlpha",
187 "value": 0.5, 187 "value": 0.5,
188 - "alpha-function": "SIN",  
189 - "time-period": { 188 + "alphaFunction": "SIN",
  189 + "timePeriod": {
190 "delay": 0, 190 "delay": 0,
191 "duration": 0.5 191 "duration": 0.5
192 }, 192 },
193 "timelineColor": "#83bcc5" 193 "timelineColor": "#83bcc5"
194 }, 194 },
195 { 195 {
196 - "actor": "picture-2",  
197 - "property": "position-x", 196 + "actor": "picture2",
  197 + "property": "positionX",
198 "value": 0, 198 "value": 0,
199 - "alpha-function": "LINEAR",  
200 - "time-period": { 199 + "alphaFunction": "LINEAR",
  200 + "timePeriod": {
201 "delay": 0.25, 201 "delay": 0.25,
202 "duration": 0.25 202 "duration": 0.25
203 }, 203 },
@@ -208,22 +208,22 @@ @@ -208,22 +208,22 @@
208 "Animation_3": { 208 "Animation_3": {
209 "properties": [ 209 "properties": [
210 { 210 {
211 - "actor": "selection-3",  
212 - "property": "color-alpha", 211 + "actor": "selection3",
  212 + "property": "colorAlpha",
213 "value": 0.5, 213 "value": 0.5,
214 - "alpha-function": "SIN",  
215 - "time-period": { 214 + "alphaFunction": "SIN",
  215 + "timePeriod": {
216 "delay": 0, 216 "delay": 0,
217 "duration": 0.5 217 "duration": 0.5
218 }, 218 },
219 "timelineColor": "#83bcc5" 219 "timelineColor": "#83bcc5"
220 }, 220 },
221 { 221 {
222 - "actor": "picture-3",  
223 - "property": "position-x", 222 + "actor": "picture3",
  223 + "property": "positionX",
224 "value": 0, 224 "value": 0,
225 - "alpha-function": "LINEAR",  
226 - "time-period": { 225 + "alphaFunction": "LINEAR",
  226 + "timePeriod": {
227 "delay": 0.25, 227 "delay": 0.25,
228 "duration": 0.25 228 "duration": 0.25
229 }, 229 },
@@ -234,22 +234,22 @@ @@ -234,22 +234,22 @@
234 "Animation_4": { 234 "Animation_4": {
235 "properties": [ 235 "properties": [
236 { 236 {
237 - "actor": "selection-4",  
238 - "property": "color-alpha", 237 + "actor": "selection4",
  238 + "property": "colorAlpha",
239 "value": 0.5, 239 "value": 0.5,
240 - "alpha-function": "SIN",  
241 - "time-period": { 240 + "alphaFunction": "SIN",
  241 + "timePeriod": {
242 "delay": 0, 242 "delay": 0,
243 "duration": 0.5 243 "duration": 0.5
244 }, 244 },
245 "timelineColor": "#83bcc5" 245 "timelineColor": "#83bcc5"
246 }, 246 },
247 { 247 {
248 - "actor": "picture-4",  
249 - "property": "position-x", 248 + "actor": "picture4",
  249 + "property": "positionX",
250 "value": 0, 250 "value": 0,
251 - "alpha-function": "LINEAR",  
252 - "time-period": { 251 + "alphaFunction": "LINEAR",
  252 + "timePeriod": {
253 "delay": 0.25, 253 "delay": 0.25,
254 "duration": 0.25 254 "duration": 0.25
255 }, 255 },
@@ -260,22 +260,22 @@ @@ -260,22 +260,22 @@
260 "Animation_5": { 260 "Animation_5": {
261 "properties": [ 261 "properties": [
262 { 262 {
263 - "actor": "selection-5",  
264 - "property": "color-alpha", 263 + "actor": "selection5",
  264 + "property": "colorAlpha",
265 "value": 0.5, 265 "value": 0.5,
266 - "alpha-function": "SIN",  
267 - "time-period": { 266 + "alphaFunction": "SIN",
  267 + "timePeriod": {
268 "delay": 0, 268 "delay": 0,
269 "duration": 0.5 269 "duration": 0.5
270 }, 270 },
271 "timelineColor": "#83bcc5" 271 "timelineColor": "#83bcc5"
272 }, 272 },
273 { 273 {
274 - "actor": "picture-5",  
275 - "property": "position-x", 274 + "actor": "picture5",
  275 + "property": "positionX",
276 "value": 0, 276 "value": 0,
277 - "alpha-function": "LINEAR",  
278 - "time-period": { 277 + "alphaFunction": "LINEAR",
  278 + "timePeriod": {
279 "delay": 0.25, 279 "delay": 0.25,
280 "duration": 0.25 280 "duration": 0.25
281 }, 281 },
@@ -286,55 +286,55 @@ @@ -286,55 +286,55 @@
286 "BackAnimation": { 286 "BackAnimation": {
287 "properties": [ 287 "properties": [
288 { 288 {
289 - "actor": "picture-1",  
290 - "property": "position-x", 289 + "actor": "picture1",
  290 + "property": "positionX",
291 "value": 450, 291 "value": 450,
292 - "alpha-function": "LINEAR",  
293 - "time-period": { 292 + "alphaFunction": "LINEAR",
  293 + "timePeriod": {
294 "delay": 0, 294 "delay": 0,
295 "duration": 0.25 295 "duration": 0.25
296 }, 296 },
297 "timelineColor": "#83bcc5" 297 "timelineColor": "#83bcc5"
298 }, 298 },
299 { 299 {
300 - "actor": "picture-2",  
301 - "property": "position-x", 300 + "actor": "picture2",
  301 + "property": "positionX",
302 "value": 450, 302 "value": 450,
303 - "alpha-function": "LINEAR",  
304 - "time-period": { 303 + "alphaFunction": "LINEAR",
  304 + "timePeriod": {
305 "delay": 0, 305 "delay": 0,
306 "duration": 0.25 306 "duration": 0.25
307 }, 307 },
308 "timelineColor": "#83bcc5" 308 "timelineColor": "#83bcc5"
309 }, 309 },
310 { 310 {
311 - "actor": "picture-3",  
312 - "property": "position-x", 311 + "actor": "picture3",
  312 + "property": "positionX",
313 "value": 450, 313 "value": 450,
314 - "alpha-function": "LINEAR",  
315 - "time-period": { 314 + "alphaFunction": "LINEAR",
  315 + "timePeriod": {
316 "delay": 0, 316 "delay": 0,
317 "duration": 0.25 317 "duration": 0.25
318 }, 318 },
319 "timelineColor": "#83bcc5" 319 "timelineColor": "#83bcc5"
320 }, 320 },
321 { 321 {
322 - "actor": "picture-4",  
323 - "property": "position-x", 322 + "actor": "picture4",
  323 + "property": "positionX",
324 "value": 450, 324 "value": 450,
325 - "alpha-function": "LINEAR",  
326 - "time-period": { 325 + "alphaFunction": "LINEAR",
  326 + "timePeriod": {
327 "delay": 0, 327 "delay": 0,
328 "duration": 0.25 328 "duration": 0.25
329 }, 329 },
330 "timelineColor": "#83bcc5" 330 "timelineColor": "#83bcc5"
331 }, 331 },
332 { 332 {
333 - "actor": "picture-5",  
334 - "property": "position-x", 333 + "actor": "picture5",
  334 + "property": "positionX",
335 "value": 450, 335 "value": 450,
336 - "alpha-function": "LINEAR",  
337 - "time-period": { 336 + "alphaFunction": "LINEAR",
  337 + "timePeriod": {
338 "delay": 0, 338 "delay": 0,
339 "duration": 0.25 339 "duration": 0.25
340 }, 340 },
resources/scripts/hello-world.json
  View file @bee0766
@@ -19,6 +19,6 @@ @@ -19,6 +19,6 @@
19 "stage": [{ 19 "stage": [{
20 "type": "TextLabel", 20 "type": "TextLabel",
21 "text": "Hello World", 21 "text": "Hello World",
22 - "parent-origin": "CENTER" 22 + "parentOrigin": "CENTER"
23 }] 23 }]
24 } 24 }
resources/scripts/music-library.json
  View file @bee0766
@@ -3,9 +3,9 @@ @@ -3,9 +3,9 @@
3 { 3 {
4 "type": "Control", 4 "type": "Control",
5 "background": {"color": [ 1, 1, 1, 1 ]}, 5 "background": {"color": [ 1, 1, 1, 1 ]},
6 - "parent-origin": "TOP_LEFT",  
7 - "anchor-point": "TOP_LEFT",  
8 - "draw-mode": "STENCIL", 6 + "parentOrigin": "TOP_LEFT",
  7 + "anchorPoint": "TOP_LEFT",
  8 + "drawMode": "STENCIL",
9 "size": [ 400, 720, 0 ] 9 "size": [ 400, 720, 0 ]
10 }, 10 },
11 { 11 {
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 355, 17 355,
18 -1 18 -1
19 ], 19 ],
20 - "inherit-position": true, 20 + "inheritPosition": true,
21 "size": [ 21 "size": [
22 400, 22 400,
23 630, 23 630,
@@ -28,8 +28,8 @@ @@ -28,8 +28,8 @@
28 "filename": "{DALI_IMAGE_DIR}music-libray-main-screen.png", 28 "filename": "{DALI_IMAGE_DIR}music-libray-main-screen.png",
29 "width": 545, 29 "width": 545,
30 "height": 860, 30 "height": 860,
31 - "load-policy": "IMMEDIATE",  
32 - "release-policy": "NEVER" 31 + "loadPolicy": "IMMEDIATE",
  32 + "releasePolicy": "NEVER"
33 } 33 }
34 }, 34 },
35 { 35 {
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
44 25, 44 25,
45 1 45 1
46 ], 46 ],
47 - "inherit-position": true, 47 + "inheritPosition": true,
48 "size": [ 48 "size": [
49 30, 49 30,
50 30, 50 30,
@@ -55,8 +55,8 @@ @@ -55,8 +55,8 @@
55 "filename": "{DALI_IMAGE_DIR}music-libray-circle.png", 55 "filename": "{DALI_IMAGE_DIR}music-libray-circle.png",
56 "width": 128, 56 "width": 128,
57 "height": 128, 57 "height": 128,
58 - "load-policy": "IMMEDIATE",  
59 - "release-policy": "NEVER" 58 + "loadPolicy": "IMMEDIATE",
  59 + "releasePolicy": "NEVER"
60 } 60 }
61 }, 61 },
62 { 62 {
@@ -68,7 +68,7 @@ @@ -68,7 +68,7 @@
68 25, 68 25,
69 1 69 1
70 ], 70 ],
71 - "inherit-position": true, 71 + "inheritPosition": true,
72 "size": [ 72 "size": [
73 28.030303030303028, 73 28.030303030303028,
74 30, 74 30,
@@ -79,8 +79,8 @@ @@ -79,8 +79,8 @@
79 "filename": "{DALI_IMAGE_DIR}music-libray-triangle.png", 79 "filename": "{DALI_IMAGE_DIR}music-libray-triangle.png",
80 "width": 185, 80 "width": 185,
81 "height": 198, 81 "height": 198,
82 - "load-policy": "IMMEDIATE",  
83 - "release-policy": "NEVER" 82 + "loadPolicy": "IMMEDIATE",
  83 + "releasePolicy": "NEVER"
84 } 84 }
85 }, 85 },
86 { 86 {
@@ -92,7 +92,7 @@ @@ -92,7 +92,7 @@
92 25, 92 25,
93 1 93 1
94 ], 94 ],
95 - "inherit-position": true, 95 + "inheritPosition": true,
96 "size": [ 96 "size": [
97 30, 97 30,
98 30, 98 30,
@@ -103,8 +103,8 @@ @@ -103,8 +103,8 @@
103 "filename": "{DALI_IMAGE_DIR}music-libray-rectangle.png", 103 "filename": "{DALI_IMAGE_DIR}music-libray-rectangle.png",
104 "width": 128, 104 "width": 128,
105 "height": 128, 105 "height": 128,
106 - "load-policy": "IMMEDIATE",  
107 - "release-policy": "NEVER" 106 + "loadPolicy": "IMMEDIATE",
  107 + "releasePolicy": "NEVER"
108 } 108 }
109 } 109 }
110 ], 110 ],
@@ -114,7 +114,7 @@ @@ -114,7 +114,7 @@
114 695, 114 695,
115 1 115 1
116 ], 116 ],
117 - "inherit-position": true, 117 + "inheritPosition": true,
118 "size": [ 118 "size": [
119 400, 119 400,
120 50, 120 50,
@@ -140,7 +140,7 @@ @@ -140,7 +140,7 @@
140 20, 140 20,
141 0 141 0
142 ], 142 ],
143 - "inherit-position": true, 143 + "inheritPosition": true,
144 "size": [ 144 "size": [
145 50, 145 50,
146 20, 146 20,
@@ -148,7 +148,7 @@ @@ -148,7 +148,7 @@
148 ], 148 ],
149 "sizeAspectRatio": false, 149 "sizeAspectRatio": false,
150 "text": "12:30", 150 "text": "12:30",
151 - "point-size": 10 151 + "pointSize": 10
152 } 152 }
153 ], 153 ],
154 "name": "Indicators", 154 "name": "Indicators",
@@ -157,7 +157,7 @@ @@ -157,7 +157,7 @@
157 20, 157 20,
158 0 158 0
159 ], 159 ],
160 - "inherit-position": true, 160 + "inheritPosition": true,
161 "size": [ 161 "size": [
162 400, 162 400,
163 40, 163 40,
@@ -186,7 +186,7 @@ @@ -186,7 +186,7 @@
186 288, 186 288,
187 0 187 0
188 ], 188 ],
189 - "inherit-position": true, 189 + "inheritPosition": true,
190 "size": [ 190 "size": [
191 200, 191 200,
192 35, 192 35,
@@ -198,8 +198,8 @@ @@ -198,8 +198,8 @@
198 "filename": "{DALI_IMAGE_DIR}music-libray-foxtrot-oscar.png", 198 "filename": "{DALI_IMAGE_DIR}music-libray-foxtrot-oscar.png",
199 "width": 545, 199 "width": 545,
200 "height": 95, 200 "height": 95,
201 - "load-policy": "IMMEDIATE",  
202 - "release-policy": "NEVER" 201 + "loadPolicy": "IMMEDIATE",
  202 + "releasePolicy": "NEVER"
203 } 203 }
204 }, 204 },
205 { 205 {
@@ -211,7 +211,7 @@ @@ -211,7 +211,7 @@
211 288, 211 288,
212 0 212 0
213 ], 213 ],
214 - "inherit-position": true, 214 + "inheritPosition": true,
215 "size": [ 215 "size": [
216 200, 216 200,
217 35, 217 35,
@@ -240,7 +240,7 @@ @@ -240,7 +240,7 @@
240 266, 240 266,
241 0 241 0
242 ], 242 ],
243 - "inherit-position": true, 243 + "inheritPosition": true,
244 "size": [ 244 "size": [
245 200, 245 200,
246 80, 246 80,
@@ -254,8 +254,8 @@ @@ -254,8 +254,8 @@
254 "filename": "{DALI_IMAGE_DIR}music-libray-the-solars.png", 254 "filename": "{DALI_IMAGE_DIR}music-libray-the-solars.png",
255 "width": 545, 255 "width": 545,
256 "height": 218, 256 "height": 218,
257 - "load-policy": "IMMEDIATE",  
258 - "release-policy": "NEVER" 257 + "loadPolicy": "IMMEDIATE",
  258 + "releasePolicy": "NEVER"
259 } 259 }
260 }, 260 },
261 { 261 {
@@ -267,7 +267,7 @@ @@ -267,7 +267,7 @@
267 266, 267 266,
268 0 268 0
269 ], 269 ],
270 - "inherit-position": true, 270 + "inheritPosition": true,
271 "size": [ 271 "size": [
272 200, 272 200,
273 80, 273 80,
@@ -288,7 +288,7 @@ @@ -288,7 +288,7 @@
288 "type": "Control", 288 "type": "Control",
289 "name": "Tapped Record", 289 "name": "Tapped Record",
290 "actors": [], 290 "actors": [],
291 - "position-inheritance":"USE_PARENT_POSITION", 291 + "positionInheritance":"USE_PARENT_POSITION",
292 "signals": [ 292 "signals": [
293 { 293 {
294 "name": "tapped", 294 "name": "tapped",
@@ -309,7 +309,7 @@ @@ -309,7 +309,7 @@
309 206, 309 206,
310 0 310 0
311 ], 311 ],
312 - "inherit-position": true, 312 + "inheritPosition": true,
313 "size": [ 313 "size": [
314 200, 314 200,
315 200, 315 200,
@@ -320,8 +320,8 @@ @@ -320,8 +320,8 @@
320 "filename": "{DALI_IMAGE_DIR}music-libray-record-cover.png", 320 "filename": "{DALI_IMAGE_DIR}music-libray-record-cover.png",
321 "width": 545, 321 "width": 545,
322 "height": 502, 322 "height": 502,
323 - "load-policy": "IMMEDIATE",  
324 - "release-policy": "NEVER" 323 + "loadPolicy": "IMMEDIATE",
  324 + "releasePolicy": "NEVER"
325 } 325 }
326 }, 326 },
327 { 327 {
@@ -333,7 +333,7 @@ @@ -333,7 +333,7 @@
333 70, 333 70,
334 2 334 2
335 ], 335 ],
336 - "inherit-position": true, 336 + "inheritPosition": true,
337 "size": [ 337 "size": [
338 30, 338 30,
339 30, 339 30,
@@ -344,8 +344,8 @@ @@ -344,8 +344,8 @@
344 "filename": "{DALI_IMAGE_DIR}music-libray-arrow.png", 344 "filename": "{DALI_IMAGE_DIR}music-libray-arrow.png",
345 "width": 128, 345 "width": 128,
346 "height": 128, 346 "height": 128,
347 - "load-policy": "IMMEDIATE",  
348 - "release-policy": "NEVER" 347 + "loadPolicy": "IMMEDIATE",
  348 + "releasePolicy": "NEVER"
349 } 349 }
350 }, 350 },
351 { 351 {
@@ -357,7 +357,7 @@ @@ -357,7 +357,7 @@
357 70, 357 70,
358 2 358 2
359 ], 359 ],
360 - "inherit-position": true, 360 + "inheritPosition": true,
361 "size": [ 361 "size": [
362 30, 362 30,
363 30, 363 30,
@@ -368,8 +368,8 @@ @@ -368,8 +368,8 @@
368 "filename": "{DALI_IMAGE_DIR}music-libray-star.png", 368 "filename": "{DALI_IMAGE_DIR}music-libray-star.png",
369 "width": 121, 369 "width": 121,
370 "height": 128, 370 "height": 128,
371 - "load-policy": "IMMEDIATE",  
372 - "release-policy": "NEVER" 371 + "loadPolicy": "IMMEDIATE",
  372 + "releasePolicy": "NEVER"
373 } 373 }
374 }, 374 },
375 { 375 {
@@ -381,7 +381,7 @@ @@ -381,7 +381,7 @@
381 440, 381 440,
382 3 382 3
383 ], 383 ],
384 - "inherit-position": true, 384 + "inheritPosition": true,
385 "size": [ 385 "size": [
386 50, 386 50,
387 50, 387 50,
@@ -397,8 +397,8 @@ @@ -397,8 +397,8 @@
397 "filename": "{DALI_IMAGE_DIR}music-libray-pause.png", 397 "filename": "{DALI_IMAGE_DIR}music-libray-pause.png",
398 "width": 128, 398 "width": 128,
399 "height": 128, 399 "height": 128,
400 - "load-policy": "IMMEDIATE",  
401 - "release-policy": "NEVER" 400 + "loadPolicy": "IMMEDIATE",
  401 + "releasePolicy": "NEVER"
402 } 402 }
403 }, 403 },
404 { 404 {
@@ -410,7 +410,7 @@ @@ -410,7 +410,7 @@
410 70, 410 70,
411 2 411 2
412 ], 412 ],
413 - "inherit-position": true, 413 + "inheritPosition": true,
414 "size": [ 414 "size": [
415 30, 415 30,
416 30, 416 30,
@@ -421,8 +421,8 @@ @@ -421,8 +421,8 @@
421 "filename": "{DALI_IMAGE_DIR}music-libray-menu.png", 421 "filename": "{DALI_IMAGE_DIR}music-libray-menu.png",
422 "width": 32, 422 "width": 32,
423 "height": 32, 423 "height": 32,
424 - "load-policy": "IMMEDIATE",  
425 - "release-policy": "NEVER" 424 + "loadPolicy": "IMMEDIATE",
  425 + "releasePolicy": "NEVER"
426 } 426 }
427 } 427 }
428 ], 428 ],
@@ -431,10 +431,10 @@ @@ -431,10 +431,10 @@
431 "properties": [ 431 "properties": [
432 { 432 {
433 "actor": "Tapped Record", 433 "actor": "Tapped Record",
434 - "property": "color-alpha", 434 + "property": "colorAlpha",
435 "value": 0, 435 "value": 0,
436 - "alpha-function": "LINEAR",  
437 - "time-period": { 436 + "alphaFunction": "LINEAR",
  437 + "timePeriod": {
438 "delay": 0, 438 "delay": 0,
439 "duration": 0.1 439 "duration": 0.1
440 }, 440 },
@@ -448,8 +448,8 @@ @@ -448,8 +448,8 @@
448 240, 448 240,
449 0 449 0
450 ], 450 ],
451 - "alpha-function": "LINEAR",  
452 - "time-period": { 451 + "alphaFunction": "LINEAR",
  452 + "timePeriod": {
453 "delay": 0, 453 "delay": 0,
454 "duration": 0.3 454 "duration": 0.3
455 }, 455 },
@@ -463,8 +463,8 @@ @@ -463,8 +463,8 @@
463 2, 463 2,
464 1 464 1
465 ], 465 ],
466 - "alpha-function": "LINEAR",  
467 - "time-period": { 466 + "alphaFunction": "LINEAR",
  467 + "timePeriod": {
468 "delay": 0, 468 "delay": 0,
469 "duration": 0.3 469 "duration": 0.3
470 }, 470 },
@@ -479,8 +479,8 @@ @@ -479,8 +479,8 @@
479 0.6509803921568628, 479 0.6509803921568628,
480 1 480 1
481 ], 481 ],
482 - "alpha-function": "LINEAR",  
483 - "time-period": { 482 + "alphaFunction": "LINEAR",
  483 + "timePeriod": {
484 "delay": 0.3, 484 "delay": 0.3,
485 "duration": 0.2 485 "duration": 0.2
486 }, 486 },
@@ -494,8 +494,8 @@ @@ -494,8 +494,8 @@
494 360, 494 360,
495 0 495 0
496 ], 496 ],
497 - "alpha-function": "LINEAR",  
498 - "time-period": { 497 + "alphaFunction": "LINEAR",
  498 + "timePeriod": {
499 "delay": 0, 499 "delay": 0,
500 "duration": 0.3 500 "duration": 0.3
501 }, 501 },
@@ -509,8 +509,8 @@ @@ -509,8 +509,8 @@
509 520, 509 520,
510 0 510 0
511 ], 511 ],
512 - "alpha-function": "LINEAR",  
513 - "time-period": { 512 + "alphaFunction": "LINEAR",
  513 + "timePeriod": {
514 "delay": 0.3, 514 "delay": 0.3,
515 "duration": 0.2 515 "duration": 0.2
516 }, 516 },
@@ -524,8 +524,8 @@ @@ -524,8 +524,8 @@
524 2, 524 2,
525 1 525 1
526 ], 526 ],
527 - "alpha-function": "LINEAR",  
528 - "time-period": { 527 + "alphaFunction": "LINEAR",
  528 + "timePeriod": {
529 "delay": 0, 529 "delay": 0,
530 "duration": 0.3 530 "duration": 0.3
531 }, 531 },
@@ -539,8 +539,8 @@ @@ -539,8 +539,8 @@
539 360, 539 360,
540 0 540 0
541 ], 541 ],
542 - "alpha-function": "LINEAR",  
543 - "time-period": { 542 + "alphaFunction": "LINEAR",
  543 + "timePeriod": {
544 "delay": 0, 544 "delay": 0,
545 "duration": 0.3 545 "duration": 0.3
546 }, 546 },
@@ -554,8 +554,8 @@ @@ -554,8 +554,8 @@
554 520, 554 520,
555 0 555 0
556 ], 556 ],
557 - "alpha-function": "LINEAR",  
558 - "time-period": { 557 + "alphaFunction": "LINEAR",
  558 + "timePeriod": {
559 "delay": 0.3, 559 "delay": 0.3,
560 "duration": 0.2 560 "duration": 0.2
561 }, 561 },
@@ -569,8 +569,8 @@ @@ -569,8 +569,8 @@
569 2, 569 2,
570 1 570 1
571 ], 571 ],
572 - "alpha-function": "LINEAR",  
573 - "time-period": { 572 + "alphaFunction": "LINEAR",
  573 + "timePeriod": {
574 "delay": 0, 574 "delay": 0,
575 "duration": 0.3 575 "duration": 0.3
576 }, 576 },
@@ -585,8 +585,8 @@ @@ -585,8 +585,8 @@
585 1, 585 1,
586 1 586 1
587 ], 587 ],
588 - "alpha-function": "LINEAR",  
589 - "time-period": { 588 + "alphaFunction": "LINEAR",
  589 + "timePeriod": {
590 "delay": 0.5, 590 "delay": 0.5,
591 "duration": 0.2 591 "duration": 0.2
592 }, 592 },
@@ -600,8 +600,8 @@ @@ -600,8 +600,8 @@
600 288, 600 288,
601 0 601 0
602 ], 602 ],
603 - "alpha-function": "LINEAR",  
604 - "time-period": { 603 + "alphaFunction": "LINEAR",
  604 + "timePeriod": {
605 "delay": 0, 605 "delay": 0,
606 "duration": 0.3 606 "duration": 0.3
607 }, 607 },
@@ -615,8 +615,8 @@ @@ -615,8 +615,8 @@
615 635, 615 635,
616 0 616 0
617 ], 617 ],
618 - "alpha-function": "LINEAR",  
619 - "time-period": { 618 + "alphaFunction": "LINEAR",
  619 + "timePeriod": {
620 "delay": 0.3, 620 "delay": 0.3,
621 "duration": 0.2 621 "duration": 0.2
622 }, 622 },
@@ -630,8 +630,8 @@ @@ -630,8 +630,8 @@
630 2, 630 2,
631 1 631 1
632 ], 632 ],
633 - "alpha-function": "LINEAR",  
634 - "time-period": { 633 + "alphaFunction": "LINEAR",
  634 + "timePeriod": {
635 "delay": 0, 635 "delay": 0,
636 "duration": 0.3 636 "duration": 0.3
637 }, 637 },
@@ -645,8 +645,8 @@ @@ -645,8 +645,8 @@
645 288, 645 288,
646 0 646 0
647 ], 647 ],
648 - "alpha-function": "LINEAR",  
649 - "time-period": { 648 + "alphaFunction": "LINEAR",
  649 + "timePeriod": {
650 "delay": 0, 650 "delay": 0,
651 "duration": 0.3 651 "duration": 0.3
652 }, 652 },
@@ -660,8 +660,8 @@ @@ -660,8 +660,8 @@
660 635, 660 635,
661 0 661 0
662 ], 662 ],
663 - "alpha-function": "LINEAR",  
664 - "time-period": { 663 + "alphaFunction": "LINEAR",
  664 + "timePeriod": {
665 "delay": 0.3, 665 "delay": 0.3,
666 "duration": 0.2 666 "duration": 0.2
667 }, 667 },
@@ -675,8 +675,8 @@ @@ -675,8 +675,8 @@
675 2, 675 2,
676 1 676 1
677 ], 677 ],
678 - "alpha-function": "LINEAR",  
679 - "time-period": { 678 + "alphaFunction": "LINEAR",
  679 + "timePeriod": {
680 "delay": 0, 680 "delay": 0,
681 "duration": 0.3 681 "duration": 0.3
682 }, 682 },
@@ -691,8 +691,8 @@ @@ -691,8 +691,8 @@
691 1, 691 1,
692 1 692 1
693 ], 693 ],
694 - "alpha-function": "LINEAR",  
695 - "time-period": { 694 + "alphaFunction": "LINEAR",
  695 + "timePeriod": {
696 "delay": 0.5, 696 "delay": 0.5,
697 "duration": 0.2 697 "duration": 0.2
698 }, 698 },
@@ -706,8 +706,8 @@ @@ -706,8 +706,8 @@
706 70, 706 70,
707 2 707 2
708 ], 708 ],
709 - "alpha-function": "LINEAR",  
710 - "time-period": { 709 + "alphaFunction": "LINEAR",
  710 + "timePeriod": {
711 "delay": 0.3, 711 "delay": 0.3,
712 "duration": 0.2 712 "duration": 0.2
713 }, 713 },
@@ -721,8 +721,8 @@ @@ -721,8 +721,8 @@
721 70, 721 70,
722 2 722 2
723 ], 723 ],
724 - "alpha-function": "LINEAR",  
725 - "time-period": { 724 + "alphaFunction": "LINEAR",
  725 + "timePeriod": {
726 "delay": 0.299, 726 "delay": 0.299,
727 "duration": 0.2 727 "duration": 0.2
728 }, 728 },
@@ -736,8 +736,8 @@ @@ -736,8 +736,8 @@
736 70, 736 70,
737 2 737 2
738 ], 738 ],
739 - "alpha-function": "LINEAR",  
740 - "time-period": { 739 + "alphaFunction": "LINEAR",
  740 + "timePeriod": {
741 "delay": 0.3, 741 "delay": 0.3,
742 "duration": 0.2 742 "duration": 0.2
743 }, 743 },
@@ -751,8 +751,8 @@ @@ -751,8 +751,8 @@
751 440, 751 440,
752 3 752 3
753 ], 753 ],
754 - "alpha-function": "LINEAR",  
755 - "time-period": { 754 + "alphaFunction": "LINEAR",
  755 + "timePeriod": {
756 "delay": 0.599, 756 "delay": 0.599,
757 "duration": 0.1 757 "duration": 0.1
758 }, 758 },
@@ -766,8 +766,8 @@ @@ -766,8 +766,8 @@
766 0.1, 766 0.1,
767 1 767 1
768 ], 768 ],
769 - "alpha-function": "LINEAR",  
770 - "time-period": { 769 + "alphaFunction": "LINEAR",
  770 + "timePeriod": {
771 "delay": 0.6, 771 "delay": 0.6,
772 "duration": 0.1 772 "duration": 0.1
773 }, 773 },
@@ -781,8 +781,8 @@ @@ -781,8 +781,8 @@
781 1, 781 1,
782 1 782 1
783 ], 783 ],
784 - "alpha-function": "LINEAR",  
785 - "time-period": { 784 + "alphaFunction": "LINEAR",
  785 + "timePeriod": {
786 "delay": 0.7, 786 "delay": 0.7,
787 "duration": 0.3 787 "duration": 0.3
788 }, 788 },
resources/scripts/popup.json
  View file @bee0766
@@ -5,98 +5,98 @@ @@ -5,98 +5,98 @@
5 "stage": [ 5 "stage": [
6 { 6 {
7 "type": "ConfirmationPopup", 7 "type": "ConfirmationPopup",
8 - "name": "confirmation-popup",  
9 - "parent-origin": [0.5, 0.55, 0.5],  
10 - "anchor-point": "CENTER",  
11 - "width-resize-policy": "SIZE_RELATIVE_TO_PARENT",  
12 - "height-resize-policy": "USE_NATURAL_SIZE",  
13 - "size-mode-factor": [0.65, 1.0, 1.0],  
14 - "tail-visibility": false,  
15 - "tail-position": [0, 0, 0],  
16 - "display-change-animation-duration": 1.0,  
17 - "contextual-mode": "NON_CONTEXTUAL",  
18 - "animation-mode": "ZOOM",  
19 - "control-ok": "control-ok",  
20 - "control-cancel": "control-cancel",  
21 - "connect-signal-ok-selected": "clicked",  
22 - "connect-signal-cancel-selected": "clicked", 8 + "name": "confirmationPopup",
  9 + "parentOrigin": [0.5, 0.55, 0.5],
  10 + "anchorPoint": "CENTER",
  11 + "widthResizePolicy": "SIZE_RELATIVE_TO_PARENT",
  12 + "heightResizePolicy": "USE_NATURAL_SIZE",
  13 + "sizeModeFactor": [0.65, 1.0, 1.0],
  14 + "tailVisibility": false,
  15 + "tailPosition": [0, 0, 0],
  16 + "displayChangeAnimationDuration": 1.0,
  17 + "contextualMode": "NON_CONTEXTUAL",
  18 + "animationMode": "ZOOM",
  19 + "controlOk": "controlOk",
  20 + "controlCancel": "controlCancel",
  21 + "connectSignalOkSelected": "clicked",
  22 + "connectSignalCancelSelected": "clicked",
23 "title": { 23 "title": {
24 "type": "TextLabel", 24 "type": "TextLabel",
25 "text": "Title text", 25 "text": "Title text",
26 - "text-color": [1, 1, 1, 1] 26 + "textColor": [1, 1, 1, 1]
27 }, 27 },
28 "content": { 28 "content": {
29 "type": "TextLabel", 29 "type": "TextLabel",
30 "text": "Content text", 30 "text": "Content text",
31 "padding": [20, 20, 20, 0], 31 "padding": [20, 20, 20, 0],
32 - "text-color": [1, 1, 1, 1] 32 + "textColor": [1, 1, 1, 1]
33 }, 33 },
34 "footer": { 34 "footer": {
35 "type": "Control", 35 "type": "Control",
36 "size": [0, 80, 0], 36 "size": [0, 80, 0],
37 - "width-resize-policy": "FILL_TO_PARENT",  
38 - "height-resize-policy": "FIXED",  
39 - "parent-origin": "CENTER",  
40 - "anchor-point": "CENTER", 37 + "widthResizePolicy": "FILL_TO_PARENT",
  38 + "heightResizePolicy": "FIXED",
  39 + "parentOrigin": "CENTER",
  40 + "anchorPoint": "CENTER",
41 "actors": [ 41 "actors": [
42 { 42 {
43 "type": "PushButton", 43 "type": "PushButton",
44 - "name": "control-ok",  
45 - "parent-origin": "CENTER_LEFT",  
46 - "anchor-point": "CENTER_LEFT", 44 + "name": "controlOk",
  45 + "parentOrigin": "CENTER_LEFT",
  46 + "anchorPoint": "CENTER_LEFT",
47 "position": [20, 0, 0], 47 "position": [20, 0, 0],
48 - "label-text": "OK" 48 + "labelText": "OK"
49 }, 49 },
50 { 50 {
51 "type": "PushButton", 51 "type": "PushButton",
52 - "name": "control-cancel",  
53 - "parent-origin": "CENTER_RIGHT",  
54 - "anchor-point": "CENTER_RIGHT", 52 + "name": "controlCancel",
  53 + "parentOrigin": "CENTER_RIGHT",
  54 + "anchorPoint": "CENTER_RIGHT",
55 "position": [-20, 0, 0], 55 "position": [-20, 0, 0],
56 - "label-text": "Cancel" 56 + "labelText": "Cancel"
57 } 57 }
58 ] 58 ]
59 }, 59 },
60 "signals": [ 60 "signals": [
61 { 61 {
62 - "name": "control-signal-ok", 62 + "name": "controlSignalOk",
63 "action": "set", 63 "action": "set",
64 - "actor": "selection-label", 64 + "actor": "selectionLabel",
65 "property": "text", 65 "property": "text",
66 "value": "User pressed: OK Button" 66 "value": "User pressed: OK Button"
67 }, 67 },
68 { 68 {
69 - "name": "control-signal-ok", 69 + "name": "controlSignalOk",
70 "action": "set", 70 "action": "set",
71 - "actor": "confirmation-popup",  
72 - "property": "display-state", 71 + "actor": "confirmationPopup",
  72 + "property": "displayState",
73 "value": "HIDDEN" 73 "value": "HIDDEN"
74 }, 74 },
75 { 75 {
76 - "name": "control-signal-cancel", 76 + "name": "controlSignalCancel",
77 "action": "set", 77 "action": "set",
78 - "actor": "selection-label", 78 + "actor": "selectionLabel",
79 "property": "text", 79 "property": "text",
80 "value": "User pressed: Cancel Button" 80 "value": "User pressed: Cancel Button"
81 }, 81 },
82 { 82 {
83 - "name": "control-signal-cancel", 83 + "name": "controlSignalCancel",
84 "action": "set", 84 "action": "set",
85 - "actor": "confirmation-popup",  
86 - "property": "display-state", 85 + "actor": "confirmationPopup",
  86 + "property": "displayState",
87 "value": "HIDDEN" 87 "value": "HIDDEN"
88 }, 88 },
89 { 89 {
90 - "name": "touched-outside", 90 + "name": "touchedOutside",
91 "action": "set", 91 "action": "set",
92 - "actor": "confirmation-popup",  
93 - "property": "display-state", 92 + "actor": "confirmationPopup",
  93 + "property": "displayState",
94 "value": "HIDDEN" 94 "value": "HIDDEN"
95 }, 95 },
96 { 96 {
97 - "name": "touched-outside", 97 + "name": "touchedOutside",
98 "action": "set", 98 "action": "set",
99 - "actor": "selection-label", 99 + "actor": "selectionLabel",
100 "property": "text", 100 "property": "text",
101 "value": "No button pressed, backing touched" 101 "value": "No button pressed, backing touched"
102 } 102 }
@@ -104,45 +104,45 @@ @@ -104,45 +104,45 @@
104 }, 104 },
105 { 105 {
106 "type": "ConfirmationPopup", 106 "type": "ConfirmationPopup",
107 - "name": "custom-animation-popup",  
108 - "parent-origin": [0.5, 0.55, 0.5],  
109 - "anchor-point": "CENTER",  
110 - "width-resize-policy": "SIZE_RELATIVE_TO_PARENT",  
111 - "height-resize-policy": "USE_NATURAL_SIZE",  
112 - "size-mode-factor": [0.65, 1.0, 1.0],  
113 - "tail-visible": false,  
114 - "tail-position": [0, 0, 0],  
115 - "display-change-animation-duration": 1.0,  
116 - "contextual-mode": "NON_CONTEXTUAL",  
117 - "control-ok": "control-ok",  
118 - "control-cancel": "control-cancel",  
119 - "connect-signal-ok-selected": "clicked",  
120 - "connect-signal-cancel-selected": "clicked",  
121 - "animation-mode": "CUSTOM",  
122 - "entry-animation": {  
123 - "actor": "custom-animation-popup", 107 + "name": "customAnimationPopup",
  108 + "parentOrigin": [0.5, 0.55, 0.5],
  109 + "anchorPoint": "CENTER",
  110 + "widthResizePolicy": "SIZE_RELATIVE_TO_PARENT",
  111 + "heightResizePolicy": "USE_NATURAL_SIZE",
  112 + "sizeModeFactor": [0.65, 1.0, 1.0],
  113 + "tailVisible": false,
  114 + "tailPosition": [0, 0, 0],
  115 + "displayChangeAnimationDuration": 1.0,
  116 + "contextualMode": "NON_CONTEXTUAL",
  117 + "controlOk": "controlOk",
  118 + "controlCancel": "controlCancel",
  119 + "connectSignalOkSelected": "clicked",
  120 + "connectSignalCancelSelected": "clicked",
  121 + "animationMode": "CUSTOM",
  122 + "entryAnimation": {
  123 + "actor": "customAnimationPopup",
124 "property": "position", 124 "property": "position",
125 "value": [ 125 "value": [
126 0, 126 0,
127 0, 127 0,
128 0 128 0
129 ], 129 ],
130 - "alpha-function": "EASE_OUT",  
131 - "time-period": { 130 + "alphaFunction": "EASE_OUT",
  131 + "timePeriod": {
132 "delay": 0.0, 132 "delay": 0.0,
133 "duration": 1.0 133 "duration": 1.0
134 } 134 }
135 }, 135 },
136 - "exit-animation": {  
137 - "actor": "custom-animation-popup", 136 + "exitAnimation": {
  137 + "actor": "customAnimationPopup",
138 "property": "position", 138 "property": "position",
139 "value": [ 139 "value": [
140 -450, 140 -450,
141 -225, 141 -225,
142 0 142 0
143 ], 143 ],
144 - "alpha-function": "EASE_IN",  
145 - "time-period": { 144 + "alphaFunction": "EASE_IN",
  145 + "timePeriod": {
146 "delay": 0.0, 146 "delay": 0.0,
147 "duration": 1.0 147 "duration": 1.0
148 } 148 }
@@ -150,167 +150,167 @@ @@ -150,167 +150,167 @@
150 "title": { 150 "title": {
151 "type": "TextLabel", 151 "type": "TextLabel",
152 "text": "Title text", 152 "text": "Title text",
153 - "text-color": [1, 1, 1, 1] 153 + "textColor": [1, 1, 1, 1]
154 }, 154 },
155 "content": { 155 "content": {
156 "type": "TextLabel", 156 "type": "TextLabel",
157 "text": "Content text", 157 "text": "Content text",
158 "padding": [20, 20, 20, 0], 158 "padding": [20, 20, 20, 0],
159 - "text-color": [1, 1, 1, 1] 159 + "textColor": [1, 1, 1, 1]
160 }, 160 },
161 "footer": { 161 "footer": {
162 "type": "Control", 162 "type": "Control",
163 "size": [0, 80, 0], 163 "size": [0, 80, 0],
164 - "width-resize-policy": "FILL_TO_PARENT",  
165 - "height-resize-policy": "FIXED",  
166 - "parent-origin": "CENTER",  
167 - "anchor-point": "CENTER", 164 + "widthResizePolicy": "FILL_TO_PARENT",
  165 + "heightResizePolicy": "FIXED",
  166 + "parentOrigin": "CENTER",
  167 + "anchorPoint": "CENTER",
168 "actors": [ 168 "actors": [
169 { 169 {
170 "type": "PushButton", 170 "type": "PushButton",
171 - "name": "control-ok",  
172 - "parent-origin": "CENTER_LEFT",  
173 - "anchor-point": "CENTER_LEFT", 171 + "name": "controlOk",
  172 + "parentOrigin": "CENTER_LEFT",
  173 + "anchorPoint": "CENTER_LEFT",
174 "position": [20, 0, 0], 174 "position": [20, 0, 0],
175 - "label-text": "OK" 175 + "labelText": "OK"
176 }, 176 },
177 { 177 {
178 "type": "PushButton", 178 "type": "PushButton",
179 - "name": "control-cancel",  
180 - "parent-origin": "CENTER_RIGHT",  
181 - "anchor-point": "CENTER_RIGHT", 179 + "name": "controlCancel",
  180 + "parentOrigin": "CENTER_RIGHT",
  181 + "anchorPoint": "CENTER_RIGHT",
182 "position": [-20, 0, 0], 182 "position": [-20, 0, 0],
183 - "label-text": "Cancel" 183 + "labelText": "Cancel"
184 } 184 }
185 ] 185 ]
186 }, 186 },
187 "signals": [ 187 "signals": [
188 { 188 {
189 - "name": "control-signal-ok", 189 + "name": "controlSignalOk",
190 "action": "set", 190 "action": "set",
191 - "actor": "selection-label", 191 + "actor": "selectionLabel",
192 "property": "text", 192 "property": "text",
193 "value": "User pressed: OK Button" 193 "value": "User pressed: OK Button"
194 }, 194 },
195 { 195 {
196 - "name": "control-signal-ok", 196 + "name": "controlSignalOk",
197 "action": "set", 197 "action": "set",
198 - "actor": "custom-animation-popup",  
199 - "property": "display-state", 198 + "actor": "customAnimationPopup",
  199 + "property": "displayState",
200 "value": "HIDDEN" 200 "value": "HIDDEN"
201 }, 201 },
202 { 202 {
203 - "name": "control-signal-cancel", 203 + "name": "controlSignalCancel",
204 "action": "set", 204 "action": "set",
205 - "actor": "selection-label", 205 + "actor": "selectionLabel",
206 "property": "text", 206 "property": "text",
207 "value": "User pressed: Cancel Button" 207 "value": "User pressed: Cancel Button"
208 }, 208 },
209 { 209 {
210 - "name": "control-signal-cancel", 210 + "name": "controlSignalCancel",
211 "action": "set", 211 "action": "set",
212 - "actor": "custom-animation-popup",  
213 - "property": "display-state", 212 + "actor": "customAnimationPopup",
  213 + "property": "displayState",
214 "value": "HIDDEN" 214 "value": "HIDDEN"
215 }, 215 },
216 { 216 {
217 - "name": "touched-outside", 217 + "name": "touchedOutside",
218 "action": "set", 218 "action": "set",
219 - "actor": "custom-animation-popup",  
220 - "property": "display-state", 219 + "actor": "customAnimationPopup",
  220 + "property": "displayState",
221 "value": "HIDDEN" 221 "value": "HIDDEN"
222 }, 222 },
223 { 223 {
224 - "name": "touched-outside", 224 + "name": "touchedOutside",
225 "action": "set", 225 "action": "set",
226 - "actor": "selection-label", 226 + "actor": "selectionLabel",
227 "property": "text", 227 "property": "text",
228 "value": "No button pressed, backing touched" 228 "value": "No button pressed, backing touched"
229 } 229 }
230 ] 230 ]
231 }, 231 },
232 { 232 {
233 - "type": "popup-toast", 233 + "type": "PopupToast",
234 "name": "toast", 234 "name": "toast",
235 - "width-resize-policy": "SIZE_RELATIVE_TO_PARENT",  
236 - "height-resize-policy": "USE_NATURAL_SIZE",  
237 - "size-mode-factor": [0.85, 0, 0], 235 + "widthResizePolicy": "SIZE_RELATIVE_TO_PARENT",
  236 + "heightResizePolicy": "USE_NATURAL_SIZE",
  237 + "sizeModeFactor": [0.85, 0, 0],
238 "title": { 238 "title": {
239 "type": "TextLabel", 239 "type": "TextLabel",
240 - "width-resize-policy": "FILL_TO_PARENT",  
241 - "height-resize-policy": "USE_NATURAL_SIZE",  
242 - "parent-origin": "CENTER",  
243 - "anchor-point": "CENTER", 240 + "widthResizePolicy": "FILL_TO_PARENT",
  241 + "heightResizePolicy": "USE_NATURAL_SIZE",
  242 + "parentOrigin": "CENTER",
  243 + "anchorPoint": "CENTER",
244 "text": "This is a toast popup. \nIt will auto-hide itself.", 244 "text": "This is a toast popup. \nIt will auto-hide itself.",
245 - "text-color": [1, 1, 1, 1],  
246 - "multi-line": true,  
247 - "horizontal-alignment": "CENTER",  
248 - "vertical-alignment": "CENTER", 245 + "textColor": [1, 1, 1, 1],
  246 + "multiLine": true,
  247 + "horizontalAlignment": "CENTER",
  248 + "verticalAlignment": "CENTER",
249 "padding": [20.0, 20.0, 20.0, 20.0] 249 "padding": [20.0, 20.0, 20.0, 20.0]
250 } 250 }
251 }, 251 },
252 { 252 {
253 "type": "PushButton", 253 "type": "PushButton",
254 - "name": "popup-trigger-button",  
255 - "parent-origin": [0.1, 0.1, 0.5],  
256 - "anchor-point": "TOP_LEFT",  
257 - "width-resize-policy": "SIZE_RELATIVE_TO_PARENT",  
258 - "height-resize-policy": "SIZE_RELATIVE_TO_PARENT",  
259 - "size-mode-factor": [0.38, 0.14, 1.0],  
260 - "label-text": "Popup", 254 + "name": "popupTriggerButton",
  255 + "parentOrigin": [0.1, 0.1, 0.5],
  256 + "anchorPoint": "TOP_LEFT",
  257 + "widthResizePolicy": "SIZE_RELATIVE_TO_PARENT",
  258 + "heightResizePolicy": "SIZE_RELATIVE_TO_PARENT",
  259 + "sizeModeFactor": [0.38, 0.14, 1.0],
  260 + "labelText": "Popup",
261 "signals": [{ 261 "signals": [{
262 "name": "clicked", 262 "name": "clicked",
263 "action": "set", 263 "action": "set",
264 - "actor": "confirmation-popup",  
265 - "property": "display-state", 264 + "actor": "confirmationPopup",
  265 + "property": "displayState",
266 "value": "SHOWN" 266 "value": "SHOWN"
267 }] 267 }]
268 }, 268 },
269 { 269 {
270 "type": "PushButton", 270 "type": "PushButton",
271 - "name": "animated-popup-trigger-button",  
272 - "parent-origin": [0.9, 0.1, 0.5],  
273 - "anchor-point": "TOP_RIGHT",  
274 - "width-resize-policy": "SIZE_RELATIVE_TO_PARENT",  
275 - "height-resize-policy": "SIZE_RELATIVE_TO_PARENT",  
276 - "size-mode-factor": [0.38, 0.14, 1.0],  
277 - "label-text": "Animated", 271 + "name": "animatedPopupTriggerButton",
  272 + "parentOrigin": [0.9, 0.1, 0.5],
  273 + "anchorPoint": "TOP_RIGHT",
  274 + "widthResizePolicy": "SIZE_RELATIVE_TO_PARENT",
  275 + "heightResizePolicy": "SIZE_RELATIVE_TO_PARENT",
  276 + "sizeModeFactor": [0.38, 0.14, 1.0],
  277 + "labelText": "Animated",
278 "signals": [{ 278 "signals": [{
279 "name": "clicked", 279 "name": "clicked",
280 "action": "set", 280 "action": "set",
281 - "actor": "custom-animation-popup",  
282 - "property": "display-state", 281 + "actor": "customAnimationPopup",
  282 + "property": "displayState",
283 "value": "SHOWN" 283 "value": "SHOWN"
284 }] 284 }]
285 }, 285 },
286 { 286 {
287 "type": "PushButton", 287 "type": "PushButton",
288 - "name": "toast-trigger-button",  
289 - "parent-origin": [0.5, 1.0, 0.5],  
290 - "anchor-point": "BOTTOM_CENTER",  
291 - "width-resize-policy": "SIZE_RELATIVE_TO_PARENT",  
292 - "height-resize-policy": "SIZE_RELATIVE_TO_PARENT",  
293 - "size-mode-factor": [0.5, 0.14, 1.0],  
294 - "label-text": "Push for Toast", 288 + "name": "toastTriggerButton",
  289 + "parentOrigin": [0.5, 1.0, 0.5],
  290 + "anchorPoint": "BOTTOM_CENTER",
  291 + "widthResizePolicy": "SIZE_RELATIVE_TO_PARENT",
  292 + "heightResizePolicy": "SIZE_RELATIVE_TO_PARENT",
  293 + "sizeModeFactor": [0.5, 0.14, 1.0],
  294 + "labelText": "Push for Toast",
295 "signals": [{ 295 "signals": [{
296 "name": "clicked", 296 "name": "clicked",
297 "action": "set", 297 "action": "set",
298 "actor": "toast", 298 "actor": "toast",
299 - "property": "display-state", 299 + "property": "displayState",
300 "value": "SHOWN" 300 "value": "SHOWN"
301 }] 301 }]
302 }, 302 },
303 { 303 {
304 "type": "TextLabel", 304 "type": "TextLabel",
305 - "name": "selection-label",  
306 - "parent-origin": [0.5, 0.22, 0.5],  
307 - "anchor-point": "TOP_CENTER",  
308 - "width-resize-policy": "SIZE_RELATIVE_TO_PARENT",  
309 - "height-resize-policy": "SIZE_RELATIVE_TO_PARENT",  
310 - "size-mode-factor": [0.9, 0.14, 1.0], 305 + "name": "selectionLabel",
  306 + "parentOrigin": [0.5, 0.22, 0.5],
  307 + "anchorPoint": "TOP_CENTER",
  308 + "widthResizePolicy": "SIZE_RELATIVE_TO_PARENT",
  309 + "heightResizePolicy": "SIZE_RELATIVE_TO_PARENT",
  310 + "sizeModeFactor": [0.9, 0.14, 1.0],
311 "text": "No selection made", 311 "text": "No selection made",
312 - "horizontal-alignment": "CENTER",  
313 - "vertical-alignment": "CENTER" 312 + "horizontalAlignment": "CENTER",
  313 + "verticalAlignment": "CENTER"
314 } 314 }
315 ] 315 ]
316 } 316 }
resources/scripts/shader-effect-ripple.json
  View file @bee0766
@@ -8,19 +8,19 @@ @@ -8,19 +8,19 @@
8 0.9150390625, 8 0.9150390625,
9 0.0 9 0.0
10 ], 10 ],
11 - "parent-origin": [0.5, 0.5, 0.5], 11 + "parentOrigin": [0.5, 0.5, 0.5],
12 "size": [200, 200, 0], 12 "size": [200, 200, 0],
13 "effect": "Ripple2D", 13 "effect": "Ripple2D",
14 "image": { 14 "image": {
15 "filename": "{DALI_IMAGE_DIR}gallery-medium-25.jpg", 15 "filename": "{DALI_IMAGE_DIR}gallery-medium-25.jpg",
16 "width": 200, 16 "width": 200,
17 "height": 80, 17 "height": 80,
18 - "load-policy": "IMMEDIATE",  
19 - "release-policy": "NEVER" 18 + "loadPolicy": "IMMEDIATE",
  19 + "releasePolicy": "NEVER"
20 }, 20 },
21 "signals": [ 21 "signals": [
22 { 22 {
23 - "name": "on-stage", 23 + "name": "onStage",
24 "action": "play", 24 "action": "play",
25 "animation": "Animation_1" 25 "animation": "Animation_1"
26 } 26 }
@@ -36,27 +36,27 @@ @@ -36,27 +36,27 @@
36 "actor": "Image1", 36 "actor": "Image1",
37 "property": "uTime", 37 "property": "uTime",
38 "value": 10.0, 38 "value": 10.0,
39 - "alpha-function": "LINEAR",  
40 - "time-period": { 39 + "alphaFunction": "LINEAR",
  40 + "timePeriod": {
41 "delay": 0, 41 "delay": 0,
42 "duration": 10.0 42 "duration": 10.0
43 }, 43 },
44 - "gui-builder-timeline-color": "#8dc0da" 44 + "guiBuilderTimelineColor": "#8dc0da"
45 } 45 }
46 ] 46 ]
47 } 47 }
48 }, 48 },
49 - "shader-effects": { 49 + "shaderEffects": {
50 "Ripple2D": { 50 "Ripple2D": {
51 "program": { 51 "program": {
52 "vertexPrefix": "", 52 "vertexPrefix": "",
53 "vertex": "void main(void)\n{\n gl_Position = uProjection * uModelView * vec4(aPosition, 1.0);\n vTexCoord = aTexCoord;\n}\n\n", 53 "vertex": "void main(void)\n{\n gl_Position = uProjection * uModelView * vec4(aPosition, 1.0);\n vTexCoord = aTexCoord;\n}\n\n",
54 "fragmentPrefix": "", 54 "fragmentPrefix": "",
55 "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", 55 "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",
56 - "geometry-type": "GEOMETRY_TYPE_IMAGE" 56 + "geometryType": "GEOMETRY_TYPE_IMAGE"
57 }, 57 },
58 - "geometry-hints": "HINT_NONE",  
59 - "grid-density": 0, 58 + "geometryHints": "HINT_NONE",
  59 + "gridDensity": 0,
60 "loop": true, 60 "loop": true,
61 "uAmplitude": 0.02, 61 "uAmplitude": 0.02,
62 "uTime": 0.0 62 "uTime": 0.0
resources/scripts/slider-test-style.json
  View file @bee0766
@@ -23,17 +23,17 @@ @@ -23,17 +23,17 @@
23 { 23 {
24 "styles": { 24 "styles": {
25 "slider": { 25 "slider": {
26 - "anchor-point": [0.5, 0.0, 0.0],  
27 - "parent-origin": [0.5, 0.0, 0.0], 26 + "anchorPoint": [0.5, 0.0, 0.0],
  27 + "parentOrigin": [0.5, 0.0, 0.0],
28 "position": [0, 300, 0], 28 "position": [0, 300, 0],
29 "size": [480, 72, 1], 29 "size": [480, 72, 1],
30 - "lower-bound": 0,  
31 - "upper-bound": 10,  
32 - "show-popup": true,  
33 - "show-value": true,  
34 - "value-precision": 2, 30 + "lowerBound": 0,
  31 + "upperBound": 10,
  32 + "showPopup": true,
  33 + "showValue": true,
  34 + "valuePrecision": 2,
35 "value": 0.0, 35 "value": 0.0,
36 - "popup-text-color": [0.0, 1.0, 1.0, 1.0] 36 + "popupTextColor": [0.0, 1.0, 1.0, 1.0]
37 } 37 }
38 } 38 }
39 } 39 }
resources/scripts/slider.json
  View file @bee0766
@@ -17,115 +17,115 @@ @@ -17,115 +17,115 @@
17 { 17 {
18 "stage": [{ 18 "stage": [{
19 "type": "Slider", 19 "type": "Slider",
20 - "parent-origin": "TOP_CENTER", 20 + "parentOrigin": "TOP_CENTER",
21 "position": [0, 144, 0], 21 "position": [0, 144, 0],
22 "size": [480, 72, 1], 22 "size": [480, 72, 1],
23 - "lower-bound": 0,  
24 - "upper-bound": 1,  
25 - "show-popup": true,  
26 - "show-value": true,  
27 - "value-precision": 2, 23 + "lowerBound": 0,
  24 + "upperBound": 1,
  25 + "showPopup": true,
  26 + "showValue": true,
  27 + "valuePrecision": 2,
28 "value": 0.0 28 "value": 0.0
29 }, { 29 }, {
30 "type": "Slider", 30 "type": "Slider",
31 - "parent-origin": "TOP_CENTER", 31 + "parentOrigin": "TOP_CENTER",
32 "position": [0, 224, 0], 32 "position": [0, 224, 0],
33 "size": [300, 72, 1], 33 "size": [300, 72, 1],
34 - "lower-bound": 1,  
35 - "upper-bound": 10,  
36 - "show-popup": false,  
37 - "show-value": true,  
38 - "value-precision": 0, 34 + "lowerBound": 1,
  35 + "upperBound": 10,
  36 + "showPopup": false,
  37 + "showValue": true,
  38 + "valuePrecision": 0,
39 "value": 5.0 39 "value": 5.0
40 }, { 40 }, {
41 "type": "Slider", 41 "type": "Slider",
42 - "parent-origin": "TOP_CENTER", 42 + "parentOrigin": "TOP_CENTER",
43 "position": [0, 304, 0], 43 "position": [0, 304, 0],
44 "size": [300, 72, 1], 44 "size": [300, 72, 1],
45 - "lower-bound": 0,  
46 - "upper-bound": 5,  
47 - "show-popup": false,  
48 - "show-value": false, 45 + "lowerBound": 0,
  46 + "upperBound": 5,
  47 + "showPopup": false,
  48 + "showValue": false,
49 "value": 0.0, 49 "value": 0.0,
50 - "mark-tolerance": 0.1, 50 + "markTolerance": 0.1,
51 "marks": [0, 1, 2, 3, 4, 5] 51 "marks": [0, 1, 2, 3, 4, 5]
52 }, { 52 }, {
53 "type": "Slider", 53 "type": "Slider",
54 - "parent-origin": "TOP_CENTER", 54 + "parentOrigin": "TOP_CENTER",
55 "position": [0, 384, 0], 55 "position": [0, 384, 0],
56 "size": [480, 72, 1], 56 "size": [480, 72, 1],
57 - "lower-bound": 0,  
58 - "upper-bound": 5,  
59 - "show-popup": false,  
60 - "show-value": false, 57 + "lowerBound": 0,
  58 + "upperBound": 5,
  59 + "showPopup": false,
  60 + "showValue": false,
61 "value": 0.0, 61 "value": 0.0,
62 - "mark-tolerance": 0.1,  
63 - "snap-to-marks": true, 62 + "markTolerance": 0.1,
  63 + "snapToMarks": true,
64 "marks": [0, 1, 2, 3, 4, 5] 64 "marks": [0, 1, 2, 3, 4, 5]
65 }, { 65 }, {
66 "type": "Slider", 66 "type": "Slider",
67 - "parent-origin": "TOP_CENTER", 67 + "parentOrigin": "TOP_CENTER",
68 "position": [0, 464, 0], 68 "position": [0, 464, 0],
69 "size": [480, 72, 1], 69 "size": [480, 72, 1],
70 - "lower-bound": 5,  
71 - "upper-bound": 100,  
72 - "show-popup": true,  
73 - "show-value": true,  
74 - "value-precision": 0, 70 + "lowerBound": 5,
  71 + "upperBound": 100,
  72 + "showPopup": true,
  73 + "showValue": true,
  74 + "valuePrecision": 0,
75 "value": 50.0, 75 "value": 50.0,
76 - "popup-text-color": [1, 0, 0, 1],  
77 - "hit-region": [0, 48],  
78 - "backing-region": [0, 10],  
79 - "handle-region": [48, 48] 76 + "popupTextColor": [1, 0, 0, 1],
  77 + "hitRegion": [0, 48],
  78 + "backingRegion": [0, 10],
  79 + "handleRegion": [48, 48]
80 }, { 80 }, {
81 "type": "Slider", 81 "type": "Slider",
82 - "parent-origin": "TOP_CENTER", 82 + "parentOrigin": "TOP_CENTER",
83 "position": [0, 544, 0], 83 "position": [0, 544, 0],
84 "size": [480, 72, 1], 84 "size": [480, 72, 1],
85 - "lower-bound": 10,  
86 - "upper-bound": 100,  
87 - "show-popup": true,  
88 - "show-value": true,  
89 - "value-prescision": 0, 85 + "lowerBound": 10,
  86 + "upperBound": 100,
  87 + "showPopup": true,
  88 + "showValue": true,
  89 + "valuePrescision": 0,
90 "value": 100.0, 90 "value": 100.0,
91 - "hit-region": [0, 48],  
92 - "backing-region": [0, 10],  
93 - "handle-region": [48, 48],  
94 - "backing-image-name": "{DALI_IMAGE_DIR}circle_point_32x32.png",  
95 - "handle-image-name": "{DALI_IMAGE_DIR}circle_point_shadow_32x32.png",  
96 - "progress-image-name": "{DALI_IMAGE_DIR}circle_point.png",  
97 - "backing-scale9-border": [16, 0, 16, 0],  
98 - "progress-scale9-border": [16, 0, 16, 0] 91 + "hitRegion": [0, 48],
  92 + "backingRegion": [0, 10],
  93 + "handleRegion": [48, 48],
  94 + "backingImageName": "{DALI_IMAGE_DIR}circle_point_32x32.png",
  95 + "handleImageName": "{DALI_IMAGE_DIR}circle_point_shadow_32x32.png",
  96 + "progressImageName": "{DALI_IMAGE_DIR}circle_point.png",
  97 + "backingScale9Border": [16, 0, 16, 0],
  98 + "progressScale9Border": [16, 0, 16, 0]
99 }, { 99 }, {
100 "type": "Slider", 100 "type": "Slider",
101 - "parent-origin": "TOP_CENTER", 101 + "parentOrigin": "TOP_CENTER",
102 "position": [0, 624, 0], 102 "position": [0, 624, 0],
103 "size": [480, 72, 1], 103 "size": [480, 72, 1],
104 - "lower-bound": 10,  
105 - "upper-bound": 100,  
106 - "show-popup": true,  
107 - "show-value": true,  
108 - "value-precision": 0, 104 + "lowerBound": 10,
  105 + "upperBound": 100,
  106 + "showPopup": true,
  107 + "showValue": true,
  108 + "valuePrecision": 0,
109 "value": 50.0, 109 "value": 50.0,
110 - "hit-region": [0, 48],  
111 - "backing-region": [0, 10],  
112 - "handle-region": [48, 48], 110 + "hitRegion": [0, 48],
  111 + "backingRegion": [0, 10],
  112 + "handleRegion": [48, 48],
113 "enabled": false 113 "enabled": false
114 }, { 114 }, {
115 "type": "Slider", 115 "type": "Slider",
116 - "parent-origin": "TOP_CENTER", 116 + "parentOrigin": "TOP_CENTER",
117 "position": [0, 704, 0], 117 "position": [0, 704, 0],
118 "size": [480, 72, 1], 118 "size": [480, 72, 1],
119 - "lower-bound": 10,  
120 - "upper-bound": 100,  
121 - "show-popup": true,  
122 - "show-value": true,  
123 - "value-precision": 0, 119 + "lowerBound": 10,
  120 + "upperBound": 100,
  121 + "showPopup": true,
  122 + "showValue": true,
  123 + "valuePrecision": 0,
124 "value": 50.0, 124 "value": 50.0,
125 - "hit-region": [0, 48],  
126 - "backing-region": [0, 10],  
127 - "handle-region": [48, 48], 125 + "hitRegion": [0, 48],
  126 + "backingRegion": [0, 10],
  127 + "handleRegion": [48, 48],
128 "enabled": false, 128 "enabled": false,
129 - "disable-color": [1, 0, 0, 1] 129 + "disableColor": [1, 0, 0, 1]
130 }] 130 }]
131 } 131 }
resources/scripts/super-blur-view.json
  View file @bee0766
@@ -22,10 +22,10 @@ @@ -22,10 +22,10 @@
22 "blur": { 22 "blur": {
23 "duration": 1, 23 "duration": 1,
24 "properties": [{ 24 "properties": [{
25 - "actor": "super-blur",  
26 - "property": "blur-strength", 25 + "actor": "superBlur",
  26 + "property": "blurStrength",
27 "value": 1, 27 "value": 1,
28 - "time-period": { 28 + "timePeriod": {
29 "delay": 0, 29 "delay": 0,
30 "duration": 1 30 "duration": 1
31 } 31 }
@@ -34,10 +34,10 @@ @@ -34,10 +34,10 @@
34 "clear": { 34 "clear": {
35 "duration": 1, 35 "duration": 1,
36 "properties": [{ 36 "properties": [{
37 - "actor": "super-blur",  
38 - "property": "blur-strength", 37 + "actor": "superBlur",
  38 + "property": "blurStrength",
39 "value": 0, 39 "value": 0,
40 - "time-period": { 40 + "timePeriod": {
41 "delay": 0, 41 "delay": 0,
42 "duration": 1 42 "duration": 1
43 } 43 }
@@ -48,9 +48,9 @@ @@ -48,9 +48,9 @@
48 // SuperBlurView 48 // SuperBlurView
49 { 49 {
50 "type": "SuperBlurView", 50 "type": "SuperBlurView",
51 - "name": "super-blur",  
52 - "parent-origin": "TOP_CENTER",  
53 - "anchor-point": "TOP_CENTER", 51 + "name": "superBlur",
  52 + "parentOrigin": "TOP_CENTER",
  53 + "anchorPoint": "TOP_CENTER",
54 "position": [0, 10, 0], 54 "position": [0, 10, 0],
55 "size": [460, 600, 0], 55 "size": [460, 600, 0],
56 "image": { 56 "image": {
@@ -61,17 +61,17 @@ @@ -61,17 +61,17 @@
61 // Button to blur/clear 61 // Button to blur/clear
62 { 62 {
63 "type": "PushButton", 63 "type": "PushButton",
64 - "name": "toggle-button",  
65 - "parent-origin": "BOTTOM_CENTER",  
66 - "anchor-point": "BOTTOM_CENTER", 64 + "name": "toggleButton",
  65 + "parentOrigin": "BOTTOM_CENTER",
  66 + "anchorPoint": "BOTTOM_CENTER",
67 "position": [0, 0, 0], 67 "position": [0, 0, 0],
68 "size": [200, 100, 0], 68 "size": [200, 100, 0],
69 - "label-actor": { 69 + "labelActor": {
70 "type": "TextLabel", 70 "type": "TextLabel",
71 "text": "Blur" 71 "text": "Blur"
72 }, 72 },
73 - "unselected-state-image": "{DALI_IMAGE_DIR}button-background.png",  
74 - "selected-state-image": "{DALI_IMAGE_DIR}button-background.png", 73 + "unselectedStateImage": "{DALI_IMAGE_DIR}button-background.png",
  74 + "selectedStateImage": "{DALI_IMAGE_DIR}button-background.png",
75 "signals": [{ 75 "signals": [{
76 "name": "pressed", 76 "name": "pressed",
77 "action": "play", 77 "action": "play",
resources/scripts/table-view.json
  View file @bee0766
@@ -40,82 +40,82 @@ @@ -40,82 +40,82 @@
40 */ 40 */
41 41
42 "stage": [{ 42 "stage": [{
43 - "name":"simple-table", 43 + "name":"simpleTable",
44 "type":"TableView", 44 "type":"TableView",
45 "background":{ 45 "background":{
46 "color": [0.5,0.5,0,1] 46 "color": [0.5,0.5,0,1]
47 }, 47 },
48 - "parent-origin": "CENTER", 48 + "parentOrigin": "CENTER",
49 "size":[400,400,1], 49 "size":[400,400,1],
50 "rows": 4, 50 "rows": 4,
51 "columns": 4, 51 "columns": 4,
52 - "cell-padding": [10, 5],  
53 - "layout-rows": { // set the height of the rows 52 + "cellPadding": [10, 5],
  53 + "layoutRows": { // set the height of the rows
54 "0": { "policy": "fixed", "value": 40 }, 54 "0": { "policy": "fixed", "value": 40 },
55 "1": { "policy": "relative", "value": 0.33 }, 55 "1": { "policy": "relative", "value": 0.33 },
56 "2": { "policy": "fit", "value": 0 } 56 "2": { "policy": "fit", "value": 0 }
57 }, 57 },
58 - "layout-columns": { // set the widths of the columns 58 + "layoutColumns": { // set the widths of the columns
59 "0": { "policy": "fit", "value": 0 }, 59 "0": { "policy": "fit", "value": 0 },
60 "2": { "policy": "relative", "value": 0.2 }, 60 "2": { "policy": "relative", "value": 0.2 },
61 "3": { "policy": "fixed", "value": 30 } 61 "3": { "policy": "fixed", "value": 30 }
62 }, 62 },
63 "actors": [{ 63 "actors": [{
64 - "name":"gallery-1", 64 + "name":"gallery1",
65 "type":"ImageActor", 65 "type":"ImageActor",
66 - "height-resize-policy":"FILL_TO_PARENT", 66 + "heightResizePolicy":"FILL_TO_PARENT",
67 "image": { 67 "image": {
68 "filename": "{DALI_IMAGE_DIR}gallery-small-1.jpg" 68 "filename": "{DALI_IMAGE_DIR}gallery-small-1.jpg"
69 }, 69 },
70 - "custom-properties": { // properties registered dynamically  
71 - "cell-index": [0,0], // property to specify the top-left cell this child occupies  
72 - "row-span":4, // property to specify how many rows this child occupies, if not set, default value is 1  
73 - "column-span":1 // property to specify how many columns this child occupies, if nor set, defualt cvalue is 1 70 + "customProperties": { // properties registered dynamically
  71 + "cellIndex": [0,0], // property to specify the top-left cell this child occupies
  72 + "rowSpan":4, // property to specify how many rows this child occupies, if not set, default value is 1
  73 + "columnSpan":1 // property to specify how many columns this child occupies, if nor set, defualt cvalue is 1
74 } 74 }
75 },{ 75 },{
76 - "name":"gallery-2", 76 + "name":"gallery2",
77 "type":"ImageActor", 77 "type":"ImageActor",
78 - "height-resize-policy":"FILL_TO_PARENT", 78 + "heightResizePolicy":"FILL_TO_PARENT",
79 "image": { 79 "image": {
80 "filename": "{DALI_IMAGE_DIR}gallery-small-2.jpg" 80 "filename": "{DALI_IMAGE_DIR}gallery-small-2.jpg"
81 }, 81 },
82 - "custom-properties": { // properties registered dynamically  
83 - "cell-index": [0,1],  
84 - "cell-horizontal-alignment": "right" // property to specify how to align horizontally inside the cells, if not set, default value is 'left' 82 + "customProperties": { // properties registered dynamically
  83 + "cellIndex": [0,1],
  84 + "cellHorizontalAlignment": "right" // property to specify how to align horizontally inside the cells, if not set, default value is 'left'
85 } 85 }
86 },{ 86 },{
87 - "name":"gallery-3", 87 + "name":"gallery3",
88 "type":"ImageActor", 88 "type":"ImageActor",
89 "image": { 89 "image": {
90 "filename": "{DALI_IMAGE_DIR}gallery-small-3.jpg" 90 "filename": "{DALI_IMAGE_DIR}gallery-small-3.jpg"
91 }, 91 },
92 - "custom-properties": {  
93 - "cell-index":[1,1],  
94 - "row-span":3,  
95 - "cell-horizontal-alignment": "left",// property to specify how to align horizontally inside the cells, if not set, default value is 'left'  
96 - "cell-vertical-alignment": "center" // property to specify how to align vertically inside the cells, if not set, default value is 'top' 92 + "customProperties": {
  93 + "cellIndex":[1,1],
  94 + "rowSpan":3,
  95 + "cellHorizontalAlignment": "left",// property to specify how to align horizontally inside the cells, if not set, default value is 'left'
  96 + "cellVerticalAlignment": "center" // property to specify how to align vertically inside the cells, if not set, default value is 'top'
97 } 97 }
98 }, { 98 }, {
99 - "name":"gallery-4", 99 + "name":"gallery4",
100 "type":"ImageActor", 100 "type":"ImageActor",
101 - "width-resize-policy":"FILL_TO_PARENT", 101 + "widthResizePolicy":"FILL_TO_PARENT",
102 "image": { 102 "image": {
103 "filename": "{DALI_IMAGE_DIR}gallery-small-4.jpg" 103 "filename": "{DALI_IMAGE_DIR}gallery-small-4.jpg"
104 }, 104 },
105 - "custom-properties": {  
106 - "cell-index":[2,2] 105 + "customProperties": {
  106 + "cellIndex":[2,2]
107 } 107 }
108 }, { 108 }, {
109 - "name":"gallery-5", 109 + "name":"gallery5",
110 "type":"ImageActor", 110 "type":"ImageActor",
111 - "width-resize-policy":"FILL_TO_PARENT",  
112 - "height-resize-policy":"FILL_TO_PARENT", 111 + "widthResizePolicy":"FILL_TO_PARENT",
  112 + "heightResizePolicy":"FILL_TO_PARENT",
113 "image": { 113 "image": {
114 "filename": "{DALI_IMAGE_DIR}gallery-small-5.jpg" 114 "filename": "{DALI_IMAGE_DIR}gallery-small-5.jpg"
115 }, 115 },
116 - "custom-properties": {  
117 - "cell-index":[3,2],  
118 - "column-span": 2 116 + "customProperties": {
  117 + "cellIndex":[3,2],
  118 + "columnSpan": 2
119 } 119 }
120 }] 120 }]
121 }] 121 }]
resources/scripts/timing.json
  View file @bee0766
1 { 1 {
2 "templates": 2 "templates":
3 { 3 {
4 - "color-control": 4 + "colorControl":
5 { 5 {
6 "type": "Control", 6 "type": "Control",
7 - "parent-origin": "CENTER",  
8 - "anchor-point": "CENTER", 7 + "parentOrigin": "CENTER",
  8 + "anchorPoint": "CENTER",
9 "size": [ 100, 100, 1 ], 9 "size": [ 100, 100, 1 ],
10 "scale": [ 0.1, 0.1, 1 ], 10 "scale": [ 0.1, 0.1, 1 ],
11 - "color-alpha": 0, 11 + "colorAlpha": 0,
12 "background":{ "color": [ 0.95, 0.65, 0.1, 1 ] } 12 "background":{ "color": [ 0.95, 0.65, 0.1, 1 ] }
13 } 13 }
14 }, 14 },
15 "stage": [ 15 "stage": [
16 { 16 {
17 "type": "Actor", 17 "type": "Actor",
18 - "parent-origin": "CENTER",  
19 - "anchor-point": "CENTER", 18 + "parentOrigin": "CENTER",
  19 + "anchorPoint": "CENTER",
20 "actors": [{ 20 "actors": [{
21 - "type": "color-control", 21 + "type": "colorControl",
22 "name": "Container 1", 22 "name": "Container 1",
23 "position": [ 23 "position": [
24 -165, 24 -165,
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
27 ] 27 ]
28 }, 28 },
29 { 29 {
30 - "type": "color-control", 30 + "type": "colorControl",
31 "name": "Container 2", 31 "name": "Container 2",
32 "position": [ 32 "position": [
33 -55, 33 -55,
@@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
36 ] 36 ]
37 }, 37 },
38 { 38 {
39 - "type": "color-control", 39 + "type": "colorControl",
40 "name": "Container 3", 40 "name": "Container 3",
41 "position": [ 41 "position": [
42 55, 42 55,
@@ -45,7 +45,7 @@ @@ -45,7 +45,7 @@
45 ] 45 ]
46 }, 46 },
47 { 47 {
48 - "type": "color-control", 48 + "type": "colorControl",
49 "name": "Container 4", 49 "name": "Container 4",
50 "position": [ 50 "position": [
51 165, 51 165,
@@ -54,7 +54,7 @@ @@ -54,7 +54,7 @@
54 ] 54 ]
55 }, 55 },
56 { 56 {
57 - "type": "color-control", 57 + "type": "colorControl",
58 "name": "Container 5", 58 "name": "Container 5",
59 "position": [ 59 "position": [
60 -165, 60 -165,
@@ -63,7 +63,7 @@ @@ -63,7 +63,7 @@
63 ] 63 ]
64 }, 64 },
65 { 65 {
66 - "type": "color-control", 66 + "type": "colorControl",
67 "name": "Container 6", 67 "name": "Container 6",
68 "position": [ 68 "position": [
69 -55, 69 -55,
@@ -72,7 +72,7 @@ @@ -72,7 +72,7 @@
72 ] 72 ]
73 }, 73 },
74 { 74 {
75 - "type": "color-control", 75 + "type": "colorControl",
76 "name": "Container 7", 76 "name": "Container 7",
77 "position": [ 77 "position": [
78 55, 78 55,
@@ -81,7 +81,7 @@ @@ -81,7 +81,7 @@
81 ] 81 ]
82 }, 82 },
83 { 83 {
84 - "type": "color-control", 84 + "type": "colorControl",
85 "name": "Container 8", 85 "name": "Container 8",
86 "position": [ 86 "position": [
87 165, 87 165,
@@ -94,10 +94,10 @@ @@ -94,10 +94,10 @@
94 "type": "Control", 94 "type": "Control",
95 "actors": [], 95 "actors": [],
96 "name": "ControlBack", 96 "name": "ControlBack",
97 - "parent-origin": "CENTER",  
98 - "anchor-point": "CENTER",  
99 - "width-resize-policy": "FILL_TO_PARENT",  
100 - "height-resize-policy": "FILL_TO_PARENT", 97 + "parentOrigin": "CENTER",
  98 + "anchorPoint": "CENTER",
  99 + "widthResizePolicy": "FILL_TO_PARENT",
  100 + "heightResizePolicy": "FILL_TO_PARENT",
101 "position": [ 101 "position": [
102 0, 102 0,
103 0, 103 0,
@@ -121,9 +121,9 @@ @@ -121,9 +121,9 @@
121 "type": "TextLabel", 121 "type": "TextLabel",
122 "text": "Touch", 122 "text": "Touch",
123 "name": "Instruction", 123 "name": "Instruction",
124 - "parent-origin": "BOTTOM_CENTER",  
125 - "anchor-point": "BOTTOM_CENTER",  
126 - "text-color": [1, 0, 0, 1], 124 + "parentOrigin": "BOTTOM_CENTER",
  125 + "anchorPoint": "BOTTOM_CENTER",
  126 + "textColor": [1, 0, 0, 1],
127 "position": [ 127 "position": [
128 0, 128 0,
129 0, 129 0,
@@ -142,8 +142,8 @@ @@ -142,8 +142,8 @@
142 1, 142 1,
143 1 143 1
144 ], 144 ],
145 - "alpha-function": "LINEAR",  
146 - "time-period": { 145 + "alphaFunction": "LINEAR",
  146 + "timePeriod": {
147 "delay": 0.35, 147 "delay": 0.35,
148 "duration": 0.15 148 "duration": 0.15
149 }, 149 },
@@ -157,8 +157,8 @@ @@ -157,8 +157,8 @@
157 0.10000000000000003, 157 0.10000000000000003,
158 1 158 1
159 ], 159 ],
160 - "alpha-function": "LINEAR",  
161 - "time-period": { 160 + "alphaFunction": "LINEAR",
  161 + "timePeriod": {
162 "delay": 2.449, 162 "delay": 2.449,
163 "duration": 0.15 163 "duration": 0.15
164 }, 164 },
@@ -166,10 +166,10 @@ @@ -166,10 +166,10 @@
166 }, 166 },
167 { 167 {
168 "actor": "Container 1", 168 "actor": "Container 1",
169 - "property": "color-alpha", 169 + "property": "colorAlpha",
170 "value": 1, 170 "value": 1,
171 - "alpha-function": "LINEAR",  
172 - "time-period": { 171 + "alphaFunction": "LINEAR",
  172 + "timePeriod": {
173 "delay": 0.3, 173 "delay": 0.3,
174 "duration": 0.05 174 "duration": 0.05
175 }, 175 },
@@ -177,10 +177,10 @@ @@ -177,10 +177,10 @@
177 }, 177 },
178 { 178 {
179 "actor": "Container 1", 179 "actor": "Container 1",
180 - "property": "color-alpha", 180 + "property": "colorAlpha",
181 "value": 0, 181 "value": 0,
182 - "alpha-function": "LINEAR",  
183 - "time-period": { 182 + "alphaFunction": "LINEAR",
  183 + "timePeriod": {
184 "delay": 2.599, 184 "delay": 2.599,
185 "duration": 0.051 185 "duration": 0.051
186 }, 186 },
@@ -194,8 +194,8 @@ @@ -194,8 +194,8 @@
194 1, 194 1,
195 1 195 1
196 ], 196 ],
197 - "alpha-function": "LINEAR",  
198 - "time-period": { 197 + "alphaFunction": "LINEAR",
  198 + "timePeriod": {
199 "delay": 0.4, 199 "delay": 0.4,
200 "duration": 0.15 200 "duration": 0.15
201 }, 201 },
@@ -209,8 +209,8 @@ @@ -209,8 +209,8 @@
209 0.1, 209 0.1,
210 1 210 1
211 ], 211 ],
212 - "alpha-function": "LINEAR",  
213 - "time-period": { 212 + "alphaFunction": "LINEAR",
  213 + "timePeriod": {
214 "delay": 2.5, 214 "delay": 2.5,
215 "duration": 0.15 215 "duration": 0.15
216 }, 216 },
@@ -218,10 +218,10 @@ @@ -218,10 +218,10 @@
218 }, 218 },
219 { 219 {
220 "actor": "Container 2", 220 "actor": "Container 2",
221 - "property": "color-alpha", 221 + "property": "colorAlpha",
222 "value": 1, 222 "value": 1,
223 - "alpha-function": "LINEAR",  
224 - "time-period": { 223 + "alphaFunction": "LINEAR",
  224 + "timePeriod": {
225 "delay": 0.35, 225 "delay": 0.35,
226 "duration": 0.05 226 "duration": 0.05
227 }, 227 },
@@ -229,10 +229,10 @@ @@ -229,10 +229,10 @@
229 }, 229 },
230 { 230 {
231 "actor": "Container 2", 231 "actor": "Container 2",
232 - "property": "color-alpha", 232 + "property": "colorAlpha",
233 "value": 0, 233 "value": 0,
234 - "alpha-function": "LINEAR",  
235 - "time-period": { 234 + "alphaFunction": "LINEAR",
  235 + "timePeriod": {
236 "delay": 2.65, 236 "delay": 2.65,
237 "duration": 0.05 237 "duration": 0.05
238 }, 238 },
@@ -246,8 +246,8 @@ @@ -246,8 +246,8 @@
246 1, 246 1,
247 1 247 1
248 ], 248 ],
249 - "alpha-function": "LINEAR",  
250 - "time-period": { 249 + "alphaFunction": "LINEAR",
  250 + "timePeriod": {
251 "delay": 0.45, 251 "delay": 0.45,
252 "duration": 0.15 252 "duration": 0.15
253 }, 253 },
@@ -261,8 +261,8 @@ @@ -261,8 +261,8 @@
261 0.1, 261 0.1,
262 1 262 1
263 ], 263 ],
264 - "alpha-function": "LINEAR",  
265 - "time-period": { 264 + "alphaFunction": "LINEAR",
  265 + "timePeriod": {
266 "delay": 2.55, 266 "delay": 2.55,
267 "duration": 0.15 267 "duration": 0.15
268 }, 268 },
@@ -270,10 +270,10 @@ @@ -270,10 +270,10 @@
270 }, 270 },
271 { 271 {
272 "actor": "Container 3", 272 "actor": "Container 3",
273 - "property": "color-alpha", 273 + "property": "colorAlpha",
274 "value": 1, 274 "value": 1,
275 - "alpha-function": "LINEAR",  
276 - "time-period": { 275 + "alphaFunction": "LINEAR",
  276 + "timePeriod": {
277 "delay": 0.4, 277 "delay": 0.4,
278 "duration": 0.05 278 "duration": 0.05
279 }, 279 },
@@ -281,10 +281,10 @@ @@ -281,10 +281,10 @@
281 }, 281 },
282 { 282 {
283 "actor": "Container 3", 283 "actor": "Container 3",
284 - "property": "color-alpha", 284 + "property": "colorAlpha",
285 "value": 0, 285 "value": 0,
286 - "alpha-function": "LINEAR",  
287 - "time-period": { 286 + "alphaFunction": "LINEAR",
  287 + "timePeriod": {
288 "delay": 2.7, 288 "delay": 2.7,
289 "duration": 0.05 289 "duration": 0.05
290 }, 290 },
@@ -298,8 +298,8 @@ @@ -298,8 +298,8 @@
298 1, 298 1,
299 1 299 1
300 ], 300 ],
301 - "alpha-function": "LINEAR",  
302 - "time-period": { 301 + "alphaFunction": "LINEAR",
  302 + "timePeriod": {
303 "delay": 0.5, 303 "delay": 0.5,
304 "duration": 0.15 304 "duration": 0.15
305 }, 305 },
@@ -313,8 +313,8 @@ @@ -313,8 +313,8 @@
313 0.1, 313 0.1,
314 1 314 1
315 ], 315 ],
316 - "alpha-function": "LINEAR",  
317 - "time-period": { 316 + "alphaFunction": "LINEAR",
  317 + "timePeriod": {
318 "delay": 2.6, 318 "delay": 2.6,
319 "duration": 0.15 319 "duration": 0.15
320 }, 320 },
@@ -322,10 +322,10 @@ @@ -322,10 +322,10 @@
322 }, 322 },
323 { 323 {
324 "actor": "Container 4", 324 "actor": "Container 4",
325 - "property": "color-alpha", 325 + "property": "colorAlpha",
326 "value": 1, 326 "value": 1,
327 - "alpha-function": "LINEAR",  
328 - "time-period": { 327 + "alphaFunction": "LINEAR",
  328 + "timePeriod": {
329 "delay": 0.45, 329 "delay": 0.45,
330 "duration": 0.05 330 "duration": 0.05
331 }, 331 },
@@ -333,10 +333,10 @@ @@ -333,10 +333,10 @@
333 }, 333 },
334 { 334 {
335 "actor": "Container 4", 335 "actor": "Container 4",
336 - "property": "color-alpha", 336 + "property": "colorAlpha",
337 "value": 0, 337 "value": 0,
338 - "alpha-function": "LINEAR",  
339 - "time-period": { 338 + "alphaFunction": "LINEAR",
  339 + "timePeriod": {
340 "delay": 2.75, 340 "delay": 2.75,
341 "duration": 0.05 341 "duration": 0.05
342 }, 342 },
@@ -350,8 +350,8 @@ @@ -350,8 +350,8 @@
350 1, 350 1,
351 1 351 1
352 ], 352 ],
353 - "alpha-function": "LINEAR",  
354 - "time-period": { 353 + "alphaFunction": "LINEAR",
  354 + "timePeriod": {
355 "delay": 0.45, 355 "delay": 0.45,
356 "duration": 0.15 356 "duration": 0.15
357 }, 357 },
@@ -365,8 +365,8 @@ @@ -365,8 +365,8 @@
365 0.1, 365 0.1,
366 1 366 1
367 ], 367 ],
368 - "alpha-function": "LINEAR",  
369 - "time-period": { 368 + "alphaFunction": "LINEAR",
  369 + "timePeriod": {
370 "delay": 2.65, 370 "delay": 2.65,
371 "duration": 0.15 371 "duration": 0.15
372 }, 372 },
@@ -374,10 +374,10 @@ @@ -374,10 +374,10 @@
374 }, 374 },
375 { 375 {
376 "actor": "Container 5", 376 "actor": "Container 5",
377 - "property": "color-alpha", 377 + "property": "colorAlpha",
378 "value": 1, 378 "value": 1,
379 - "alpha-function": "LINEAR",  
380 - "time-period": { 379 + "alphaFunction": "LINEAR",
  380 + "timePeriod": {
381 "delay": 0.4, 381 "delay": 0.4,
382 "duration": 0.05 382 "duration": 0.05
383 }, 383 },
@@ -385,10 +385,10 @@ @@ -385,10 +385,10 @@
385 }, 385 },
386 { 386 {
387 "actor": "Container 5", 387 "actor": "Container 5",
388 - "property": "color-alpha", 388 + "property": "colorAlpha",
389 "value": 0, 389 "value": 0,
390 - "alpha-function": "LINEAR",  
391 - "time-period": { 390 + "alphaFunction": "LINEAR",
  391 + "timePeriod": {
392 "delay": 2.8, 392 "delay": 2.8,
393 "duration": 0.05 393 "duration": 0.05
394 }, 394 },
@@ -402,8 +402,8 @@ @@ -402,8 +402,8 @@
402 1, 402 1,
403 1 403 1
404 ], 404 ],
405 - "alpha-function": "LINEAR",  
406 - "time-period": { 405 + "alphaFunction": "LINEAR",
  406 + "timePeriod": {
407 "delay": 0.5, 407 "delay": 0.5,
408 "duration": 0.15 408 "duration": 0.15
409 }, 409 },
@@ -417,8 +417,8 @@ @@ -417,8 +417,8 @@
417 0.1, 417 0.1,
418 1 418 1
419 ], 419 ],
420 - "alpha-function": "LINEAR",  
421 - "time-period": { 420 + "alphaFunction": "LINEAR",
  421 + "timePeriod": {
422 "delay": 2.7, 422 "delay": 2.7,
423 "duration": 0.15 423 "duration": 0.15
424 }, 424 },
@@ -426,10 +426,10 @@ @@ -426,10 +426,10 @@
426 }, 426 },
427 { 427 {
428 "actor": "Container 6", 428 "actor": "Container 6",
429 - "property": "color-alpha", 429 + "property": "colorAlpha",
430 "value": 1, 430 "value": 1,
431 - "alpha-function": "LINEAR",  
432 - "time-period": { 431 + "alphaFunction": "LINEAR",
  432 + "timePeriod": {
433 "delay": 0.45, 433 "delay": 0.45,
434 "duration": 0.05 434 "duration": 0.05
435 }, 435 },
@@ -437,10 +437,10 @@ @@ -437,10 +437,10 @@
437 }, 437 },
438 { 438 {
439 "actor": "Container 6", 439 "actor": "Container 6",
440 - "property": "color-alpha", 440 + "property": "colorAlpha",
441 "value": 0, 441 "value": 0,
442 - "alpha-function": "LINEAR",  
443 - "time-period": { 442 + "alphaFunction": "LINEAR",
  443 + "timePeriod": {
444 "delay": 2.85, 444 "delay": 2.85,
445 "duration": 0.05 445 "duration": 0.05
446 }, 446 },
@@ -454,8 +454,8 @@ @@ -454,8 +454,8 @@
454 1, 454 1,
455 1 455 1
456 ], 456 ],
457 - "alpha-function": "LINEAR",  
458 - "time-period": { 457 + "alphaFunction": "LINEAR",
  458 + "timePeriod": {
459 "delay": 0.55, 459 "delay": 0.55,
460 "duration": 0.15 460 "duration": 0.15
461 }, 461 },
@@ -469,8 +469,8 @@ @@ -469,8 +469,8 @@
469 0.1, 469 0.1,
470 1 470 1
471 ], 471 ],
472 - "alpha-function": "LINEAR",  
473 - "time-period": { 472 + "alphaFunction": "LINEAR",
  473 + "timePeriod": {
474 "delay": 2.75, 474 "delay": 2.75,
475 "duration": 0.15 475 "duration": 0.15
476 }, 476 },
@@ -478,10 +478,10 @@ @@ -478,10 +478,10 @@
478 }, 478 },
479 { 479 {
480 "actor": "Container 7", 480 "actor": "Container 7",
481 - "property": "color-alpha", 481 + "property": "colorAlpha",
482 "value": 1, 482 "value": 1,
483 - "alpha-function": "LINEAR",  
484 - "time-period": { 483 + "alphaFunction": "LINEAR",
  484 + "timePeriod": {
485 "delay": 0.5, 485 "delay": 0.5,
486 "duration": 0.05 486 "duration": 0.05
487 }, 487 },
@@ -489,10 +489,10 @@ @@ -489,10 +489,10 @@
489 }, 489 },
490 { 490 {
491 "actor": "Container 7", 491 "actor": "Container 7",
492 - "property": "color-alpha", 492 + "property": "colorAlpha",
493 "value": 0, 493 "value": 0,
494 - "alpha-function": "LINEAR",  
495 - "time-period": { 494 + "alphaFunction": "LINEAR",
  495 + "timePeriod": {
496 "delay": 2.9, 496 "delay": 2.9,
497 "duration": 0.05 497 "duration": 0.05
498 }, 498 },
@@ -506,8 +506,8 @@ @@ -506,8 +506,8 @@
506 1, 506 1,
507 1 507 1
508 ], 508 ],
509 - "alpha-function": "LINEAR",  
510 - "time-period": { 509 + "alphaFunction": "LINEAR",
  510 + "timePeriod": {
511 "delay": 0.6, 511 "delay": 0.6,
512 "duration": 0.15 512 "duration": 0.15
513 }, 513 },
@@ -521,8 +521,8 @@ @@ -521,8 +521,8 @@
521 0.1, 521 0.1,
522 1 522 1
523 ], 523 ],
524 - "alpha-function": "LINEAR",  
525 - "time-period": { 524 + "alphaFunction": "LINEAR",
  525 + "timePeriod": {
526 "delay": 2.8, 526 "delay": 2.8,
527 "duration": 0.15 527 "duration": 0.15
528 }, 528 },
@@ -530,10 +530,10 @@ @@ -530,10 +530,10 @@
530 }, 530 },
531 { 531 {
532 "actor": "Container 8", 532 "actor": "Container 8",
533 - "property": "color-alpha", 533 + "property": "colorAlpha",
534 "value": 1, 534 "value": 1,
535 - "alpha-function": "LINEAR",  
536 - "time-period": { 535 + "alphaFunction": "LINEAR",
  536 + "timePeriod": {
537 "delay": 0.55, 537 "delay": 0.55,
538 "duration": 0.05 538 "duration": 0.05
539 }, 539 },
@@ -541,10 +541,10 @@ @@ -541,10 +541,10 @@
541 }, 541 },
542 { 542 {
543 "actor": "Container 8", 543 "actor": "Container 8",
544 - "property": "color-alpha", 544 + "property": "colorAlpha",
545 "value": 0, 545 "value": 0,
546 - "alpha-function": "LINEAR",  
547 - "time-period": { 546 + "alphaFunction": "LINEAR",
  547 + "timePeriod": {
548 "delay": 2.95, 548 "delay": 2.95,
549 "duration": 0.05 549 "duration": 0.05
550 }, 550 },
resources/style/demo-theme.json
  View file @bee0766
@@ -24,53 +24,53 @@ distributing this software or its derivatives. @@ -24,53 +24,53 @@ distributing this software or its derivatives.
24 { 24 {
25 "textlabel-Rosemary": 25 "textlabel-Rosemary":
26 { 26 {
27 - "font-family":"Rosemary" 27 + "fontFamily":"Rosemary"
28 }, 28 },
29 "textlabel": 29 "textlabel":
30 { 30 {
31 - "font-style":"Regular",  
32 - "point-size":18 31 + "fontStyle":"Regular",
  32 + "pointSize":18
33 }, 33 },
34 "launcherlabel": 34 "launcherlabel":
35 { 35 {
36 - "point-size":18 36 + "pointSize":18
37 }, 37 },
38 38
39 "toolbarlabel": 39 "toolbarlabel":
40 { 40 {
41 - "point-size":18 41 + "pointSize":18
42 }, 42 },
43 43
44 "builderlabel": 44 "builderlabel":
45 { 45 {
46 - "point-size":13 46 + "pointSize":13
47 }, 47 },
48 48
49 "scrollview": 49 "scrollview":
50 { 50 {
51 - "overshoot-effect-color":"B018" 51 + "overshootEffectColor":"B018"
52 }, 52 },
53 53
54 "grouplabel": 54 "grouplabel":
55 { 55 {
56 - "point-size":9 56 + "pointSize":9
57 }, 57 },
58 58
59 "buttonlabel": 59 "buttonlabel":
60 { 60 {
61 - "point-size":11 61 + "pointSize":11
62 }, 62 },
63 63
64 "launcherbackground": 64 "launcherbackground":
65 { 65 {
66 "background": 66 "background":
67 { 67 {
68 - "renderer-type": "gradient-renderer",  
69 - "gradient-center": [240, 400],  
70 - "gradient-radius": 932,  
71 - "gradient-units": "user-space",  
72 - "gradient-stop-color": [[0.247,0.38,0.52,1.0],[0.055,0.18,0.286,1.0]],  
73 - "gradient-stop-offset":[0.0,1.0] 68 + "rendererType": "gradientRenderer",
  69 + "gradientCenter": [240, 400],
  70 + "gradientRadius": 932,
  71 + "gradientUnits": "userSpace",
  72 + "gradientStopColor": [[0.247,0.38,0.52,1.0],[0.055,0.18,0.286,1.0]],
  73 + "gradientStopOffset":[0.0,1.0]
74 } 74 }
75 } 75 }
76 } 76 }
resources/style/mobile/demo-theme.json
  View file @bee0766
@@ -24,74 +24,74 @@ distributing this software or its derivatives. @@ -24,74 +24,74 @@ distributing this software or its derivatives.
24 { 24 {
25 "textlabel-Rosemary": 25 "textlabel-Rosemary":
26 { 26 {
27 - "font-family":"Rosemary" 27 + "fontFamily":"Rosemary"
28 }, 28 },
29 "textlabel": 29 "textlabel":
30 { 30 {
31 - "font-style":"Regular",  
32 - "point-size":18 31 + "fontStyle":"Regular",
  32 + "pointSize":18
33 }, 33 },
34 - "textlabel-font-size-0": 34 + "textlabelFontSize0":
35 { 35 {
36 - "point-size":8 36 + "pointSize":8
37 }, 37 },
38 - "textlabel-font-size-1": 38 + "textlabelFontSize1":
39 { 39 {
40 - "point-size":10 40 + "pointSize":10
41 }, 41 },
42 - "textlabel-font-size-2": 42 + "textlabelFontSize2":
43 { 43 {
44 - "point-size":15 44 + "pointSize":15
45 }, 45 },
46 - "textlabel-font-size-3": 46 + "textlabelFontSize3":
47 { 47 {
48 - "point-size":19 48 + "pointSize":19
49 }, 49 },
50 - "textlabel-font-size-4": 50 + "textlabelFontSize4":
51 { 51 {
52 - "point-size":25 52 + "pointSize":25
53 }, 53 },
54 54
55 "launcherlabel": 55 "launcherlabel":
56 { 56 {
57 - "point-size":8 57 + "pointSize":8
58 }, 58 },
59 59
60 "toolbarlabel": 60 "toolbarlabel":
61 { 61 {
62 - "point-size":10 62 + "pointSize":10
63 }, 63 },
64 64
65 "builderlabel": 65 "builderlabel":
66 { 66 {
67 - "point-size":10 67 + "pointSize":10
68 }, 68 },
69 69
70 "scrollview": 70 "scrollview":
71 { 71 {
72 - "overshoot-effect-color":"B018" 72 + "overshootEffectColor":"B018"
73 }, 73 },
74 74
75 "grouplabel": 75 "grouplabel":
76 { 76 {
77 - "point-size":6 77 + "pointSize":6
78 }, 78 },
79 79
80 "buttonlabel": 80 "buttonlabel":
81 { 81 {
82 - "point-size":8 82 + "pointSize":8
83 }, 83 },
84 84
85 "launcherbackground": 85 "launcherbackground":
86 { 86 {
87 "background": 87 "background":
88 { 88 {
89 - "renderer-type": "gradient-renderer",  
90 - "gradient-center": [360, 640],  
91 - "gradient-radius": 1468,  
92 - "gradient-units": "user-space",  
93 - "gradient-stop-color": [[0.247,0.38,0.52,1.0],[0.055,0.18,0.286,1.0]],  
94 - "gradient-stop-offset":[0.0,1.0] 89 + "rendererType": "gradientRenderer",
  90 + "gradientCenter": [360, 640],
  91 + "gradientRadius": 1468,
  92 + "gradientUnits": "userSpace",
  93 + "gradientStopColor": [[0.247,0.38,0.52,1.0],[0.055,0.18,0.286,1.0]],
  94 + "gradientStopOffset":[0.0,1.0]
95 } 95 }
96 } 96 }
97 } 97 }