Changed all property & signal names to lowerCamelCase 35/50835/7
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Mon, 2 Nov 2015 18:15:39 +0000 (18:15 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Wed, 4 Nov 2015 10:00:50 +0000 (10:00 +0000)
e.g. anchor-point-x --> anchorPointX

Change-Id: Ieac0ff1c4f2fee7f3121cd8bed03e60a554e4781

121 files changed:
automated-tests/src/dali-toolkit/utc-Dali-Builder.cpp
automated-tests/src/dali-toolkit/utc-Dali-ConfirmationPopup.cpp
automated-tests/src/dali-toolkit/utc-Dali-Control.cpp
automated-tests/src/dali-toolkit/utc-Dali-ControlImpl.cpp
automated-tests/src/dali-toolkit/utc-Dali-ControlRenderer.cpp
automated-tests/src/dali-toolkit/utc-Dali-JsonParser.cpp
automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp
automated-tests/src/dali-toolkit/utc-Dali-Popup.cpp
automated-tests/src/dali-toolkit/utc-Dali-RendererFactory.cpp
automated-tests/src/dali-toolkit/utc-Dali-ScrollBar.cpp
automated-tests/src/dali-toolkit/utc-Dali-ShaderEffects.cpp
automated-tests/src/dali-toolkit/utc-Dali-TableView.cpp
automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp
automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp
dali-toolkit/devel-api/builder/builder.h
dali-toolkit/devel-api/controls/magnifier/magnifier.h
dali-toolkit/devel-api/controls/popup/confirmation-popup.h
dali-toolkit/devel-api/controls/popup/popup.h
dali-toolkit/devel-api/controls/renderer-factory/renderer-factory.h
dali-toolkit/devel-api/controls/slider/slider.h
dali-toolkit/devel-api/controls/text-controls/text-selection-popup.h
dali-toolkit/devel-api/controls/text-controls/text-selection-toolbar.h
dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h
dali-toolkit/devel-api/shader-effects/dissolve-effect.h
dali-toolkit/devel-api/shader-effects/distance-field-effect.h
dali-toolkit/devel-api/shader-effects/motion-blur-effect.h
dali-toolkit/devel-api/shader-effects/motion-stretch-effect.h
dali-toolkit/devel-api/styling/style-manager.h
dali-toolkit/devel-api/transition-effects/cube-transition-effect.h
dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.cpp
dali-toolkit/internal/builder/builder-actor.cpp
dali-toolkit/internal/builder/builder-animations.cpp
dali-toolkit/internal/builder/builder-impl.cpp
dali-toolkit/internal/builder/builder-set-property.cpp
dali-toolkit/internal/builder/builder-signals.cpp
dali-toolkit/internal/controls/buttons/button-impl.cpp
dali-toolkit/internal/controls/buttons/push-button-impl.cpp
dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp
dali-toolkit/internal/controls/model3d-view/model3d-view-impl.cpp
dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp
dali-toolkit/internal/controls/popup/confirmation-popup-impl.cpp
dali-toolkit/internal/controls/popup/popup-impl.cpp
dali-toolkit/internal/controls/renderers/border/border-renderer.cpp
dali-toolkit/internal/controls/renderers/border/border-renderer.h
dali-toolkit/internal/controls/renderers/color/color-renderer.cpp
dali-toolkit/internal/controls/renderers/color/color-renderer.h
dali-toolkit/internal/controls/renderers/control-renderer-data-impl.cpp
dali-toolkit/internal/controls/renderers/control-renderer-impl.cpp
dali-toolkit/internal/controls/renderers/control-renderer-impl.h
dali-toolkit/internal/controls/renderers/gradient/gradient-renderer.cpp
dali-toolkit/internal/controls/renderers/gradient/gradient-renderer.h
dali-toolkit/internal/controls/renderers/image/image-renderer.cpp
dali-toolkit/internal/controls/renderers/image/image-renderer.h
dali-toolkit/internal/controls/renderers/npatch/npatch-renderer.cpp
dali-toolkit/internal/controls/renderers/npatch/npatch-renderer.h
dali-toolkit/internal/controls/renderers/renderer-factory-impl.cpp
dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h
dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp
dali-toolkit/internal/controls/shadow-view/shadow-view-impl.cpp
dali-toolkit/internal/controls/slider/slider-impl.cpp
dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp
dali-toolkit/internal/controls/table-view/table-view-impl.cpp
dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
dali-toolkit/internal/controls/text-controls/text-font-style.h
dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp
dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.cpp
dali-toolkit/internal/feedback/feedback-style.cpp
dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp
dali-toolkit/internal/styling/style-manager-impl.cpp
dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp
dali-toolkit/public-api/accessibility-manager/accessibility-manager.h
dali-toolkit/public-api/controls/buttons/button.h
dali-toolkit/public-api/controls/buttons/push-button.h
dali-toolkit/public-api/controls/control-impl.cpp
dali-toolkit/public-api/controls/control.h
dali-toolkit/public-api/controls/model3d-view/model3d-view.h
dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h
dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h
dali-toolkit/public-api/controls/scrollable/item-view/item-view.h
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h
dali-toolkit/public-api/controls/scrollable/scrollable.h
dali-toolkit/public-api/controls/table-view/table-view.h
dali-toolkit/public-api/controls/text-controls/text-field.h
dali-toolkit/public-api/controls/text-controls/text-label.h
dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h
dali-toolkit/styles/480x800/dali-toolkit-default-theme.json
dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
dali-toolkit/styles/default-feedback-theme.json
docs/content/example-code/property-example.cpp
docs/content/programming-guide/properties.h
docs/content/shared-javascript-and-cpp-documentation/font-selection.md
docs/content/shared-javascript-and-cpp-documentation/popup.md
docs/content/shared-javascript-and-cpp-documentation/programming-languages.md
docs/content/shared-javascript-and-cpp-documentation/resource-image-scaling.md
docs/content/shared-javascript-and-cpp-documentation/script-hello.md
docs/content/shared-javascript-and-cpp-documentation/script-json-specification.md
docs/content/shared-javascript-and-cpp-documentation/script-overview.md
docs/content/shared-javascript-and-cpp-documentation/text-label.md
node-addon/javascript-application-options.cpp
plugins/dali-script-v8/docs/content/actor.js
plugins/dali-script-v8/docs/content/animation.js
plugins/dali-script-v8/docs/content/dali.js
plugins/dali-script-v8/docs/content/keyboard-focus-manager.js
plugins/dali-script-v8/docs/content/pan-gesture-detector.js
plugins/dali-script-v8/docs/content/resource-image.js
plugins/dali-script-v8/docs/content/stage.js
plugins/dali-script-v8/src/animation/animation-api.cpp
plugins/dali-script-v8/src/animation/constrainer-api.cpp
plugins/dali-script-v8/src/events/pan-gesture-detector-api.cpp
plugins/dali-script-v8/src/module-loader/module-loader.cpp
plugins/dali-script-v8/src/object/handle-wrapper.cpp
plugins/dali-script-v8/src/shader-effects/shader-effect-api.cpp
plugins/dali-script-v8/src/signals/signal-manager.cpp
plugins/dali-script-v8/src/toolkit/builder/builder-api.cpp
plugins/dali-script-v8/src/utils/v8-utils.cpp
plugins/dali-script-v8/src/utils/v8-utils.h

index 164ab9e..653325c 100644 (file)
@@ -77,8 +77,8 @@ int UtcDaliBuilderQuitSignal(void)
          "[{"
            "\"type\": \"Actor\","
            "\"size\": [100,100,1],"
          "[{"
            "\"type\": \"Actor\","
            "\"size\": [100,100,1],"
-           "\"parent-origin\": \"TOP_LEFT\","
-           "\"anchor-point\": \"TOP_LEFT\","
+           "\"parentOrigin\": \"TOP_LEFT\","
+           "\"anchorPoint\": \"TOP_LEFT\","
            "\"signals\": [{"
              "\"name\": \"touched\","
              "\"action\": \"quit\""
            "\"signals\": [{"
              "\"name\": \"touched\","
              "\"action\": \"quit\""
@@ -130,16 +130,16 @@ int UtcDaliBuilderAnimationP(void)
         "  \"animations\": {"
         "    \"animate\": {"
         "      \"loop\": true,"
         "  \"animations\": {"
         "    \"animate\": {"
         "      \"loop\": true,"
-        "      \"end-action\": \"BAKE\","
-        "      \"disconnect-action\": \"BAKE\","
+        "      \"endAction\": \"BAKE\","
+        "      \"disconnectAction\": \"BAKE\","
         "      \"properties\":"
         "      [{"
         "        \"actor\": \"greeting\","
         "        \"property\": \"position\","
         "        \"value\": [300, 300, -1000],"
         "      \"properties\":"
         "      [{"
         "        \"actor\": \"greeting\","
         "        \"property\": \"position\","
         "        \"value\": [300, 300, -1000],"
-        "        \"alpha-function\": \"{ALPHA_FUNCTION}\","
+        "        \"alphaFunction\": \"{ALPHA_FUNCTION}\","
         "        \"relative\": true,"
         "        \"relative\": true,"
-        "        \"time-period\": {"
+        "        \"timePeriod\": {"
         "          \"delay\": 0,"
         "          \"duration\": 3"
         "        }"
         "          \"delay\": 0,"
         "          \"duration\": 3"
         "        }"
@@ -147,81 +147,81 @@ int UtcDaliBuilderAnimationP(void)
         "       {"
         "         \"actor\": \"greeting\","
         "         \"property\": \"visible\","
         "       {"
         "         \"actor\": \"greeting\","
         "         \"property\": \"visible\","
-        "         \"alpha-function\": \"LINEAR\","
+        "         \"alphaFunction\": \"LINEAR\","
         "         \"value\": true"
         "       },"
         "       {"
         "         \"actor\": \"greeting\","
         "         \"value\": true"
         "       },"
         "       {"
         "         \"actor\": \"greeting\","
-        "         \"property\": \"size-width\","
-        "         \"alpha-function\": \"REVERSE\","
+        "         \"property\": \"sizeWidth\","
+        "         \"alphaFunction\": \"REVERSE\","
         "         \"value\": 10.0"
         "       },"
         "       {"
         "         \"actor\": \"greeting\","
         "         \"property\": \"orientation\","
         "         \"value\": 10.0"
         "       },"
         "       {"
         "         \"actor\": \"greeting\","
         "         \"property\": \"orientation\","
-        "         \"alpha-function\": \"EASE_IN\","
+        "         \"alphaFunction\": \"EASE_IN\","
         "         \"value\": [10.0,20.0,30.0]"
         "       },"
         "       {"
         "         \"actor\": \"greeting\","
         "         \"property\": \"orientation\","
         "         \"value\": [10.0,20.0,30.0]"
         "       },"
         "       {"
         "         \"actor\": \"greeting\","
         "         \"property\": \"orientation\","
-        "         \"alpha-function\": \"EASE_OUT\","
+        "         \"alphaFunction\": \"EASE_OUT\","
         "         \"value\": [0.0, 0.0, 0.0, 1.0]"
         "       },"
         "       {"
         "         \"actor\": \"greeting\","
         "         \"property\": \"orientation\","
         "         \"value\": [0.0, 0.0, 0.0, 1.0]"
         "       },"
         "       {"
         "         \"actor\": \"greeting\","
         "         \"property\": \"orientation\","
-        "         \"alpha-function\": \"EASE_IN_OUT\","
+        "         \"alphaFunction\": \"EASE_IN_OUT\","
         "         \"value\": [0.0, 0.0, 0.0, 1.0]"
         "       },"
         "       {"
         "         \"actor\": \"greeting\","
         "         \"property\": \"orientation\","
         "         \"value\": [0.0, 0.0, 0.0, 1.0]"
         "       },"
         "       {"
         "         \"actor\": \"greeting\","
         "         \"property\": \"orientation\","
-        "         \"alpha-function\": \"EASE_IN_SINE\","
+        "         \"alphaFunction\": \"EASE_IN_SINE\","
         "         \"value\": [0.0, 0.0, 0.0, 1.0]"
         "       },"
         "       {"
         "         \"actor\": \"greeting\","
         "         \"property\": \"orientation\","
         "         \"value\": [0.0, 0.0, 0.0, 1.0]"
         "       },"
         "       {"
         "         \"actor\": \"greeting\","
         "         \"property\": \"orientation\","
-        "         \"alpha-function\": \"EASE_OUT_SINE\","
+        "         \"alphaFunction\": \"EASE_OUT_SINE\","
         "         \"value\": [0.0, 0.0, 0.0, 1.0]"
         "       },"
         "       {"
         "         \"actor\": \"greeting\","
         "         \"property\": \"orientation\","
         "         \"value\": [0.0, 0.0, 0.0, 1.0]"
         "       },"
         "       {"
         "         \"actor\": \"greeting\","
         "         \"property\": \"orientation\","
-        "         \"alpha-function\": \"EASE_IN_OUT_SINE\","
+        "         \"alphaFunction\": \"EASE_IN_OUT_SINE\","
         "         \"value\": [0.0, 0.0, 0.0, 1.0]"
         "       },"
         "       {"
         "         \"actor\": \"greeting\","
         "         \"property\": \"orientation\","
         "         \"value\": [0.0, 0.0, 0.0, 1.0]"
         "       },"
         "       {"
         "         \"actor\": \"greeting\","
         "         \"property\": \"orientation\","
-        "         \"alpha-function\": \"BOUNCE\","
+        "         \"alphaFunction\": \"BOUNCE\","
         "         \"value\": [0.0, 0.0, 0.0, 1.0]"
         "       },"
         "       {"
         "         \"actor\": \"greeting\","
         "         \"property\": \"orientation\","
         "         \"value\": [0.0, 0.0, 0.0, 1.0]"
         "       },"
         "       {"
         "         \"actor\": \"greeting\","
         "         \"property\": \"orientation\","
-        "         \"alpha-function\": \"SIN\","
+        "         \"alphaFunction\": \"SIN\","
         "         \"value\": [0.0, 0.0, 0.0, 1.0]"
         "       },"
         "       {"
         "         \"actor\": \"greeting\","
         "         \"property\": \"orientation\","
         "         \"value\": [0.0, 0.0, 0.0, 1.0]"
         "       },"
         "       {"
         "         \"actor\": \"greeting\","
         "         \"property\": \"orientation\","
-        "         \"alpha-function\": \"EASE_OUT_BACK\","
+        "         \"alphaFunction\": \"EASE_OUT_BACK\","
         "         \"value\": [0.0, 0.0, 0.0, 1.0]"
         "       }"
         "      ]"
         "    },"
         "         \"value\": [0.0, 0.0, 0.0, 1.0]"
         "       }"
         "      ]"
         "    },"
-        "    \"path-animation\": {"
+        "    \"pathAnimation\": {"
         "      \"duration\": 3.0,"
         "      \"duration\": 3.0,"
-        "      \"end-action\": \"DISCARD\","
-        "      \"disconnect-action\": \"BAKE_FINAL\","
+        "      \"endAction\": \"DISCARD\","
+        "      \"disconnectAction\": \"BAKE_FINAL\","
         "      \"properties\": [{"
         "        \"actor\": \"greeting\","
         "        \"path\":\"path0\","
         "        \"forward\":[1,0,0],"
         "      \"properties\": [{"
         "        \"actor\": \"greeting\","
         "        \"path\":\"path0\","
         "        \"forward\":[1,0,0],"
-        "        \"alpha-function\": \"EASE_IN_OUT\","
-        "        \"time-period\": {"
+        "        \"alphaFunction\": \"EASE_IN_OUT\","
+        "        \"timePeriod\": {"
         "          \"delay\": 0,"
         "          \"duration\": 3"
         "        }"
         "          \"delay\": 0,"
         "          \"duration\": 3"
         "        }"
@@ -232,7 +232,7 @@ int UtcDaliBuilderAnimationP(void)
         "    \"name\": \"greeting\","
         "    \"type\": \"TextLabel\","
         "    \"text\": \"Touch me\","
         "    \"name\": \"greeting\","
         "    \"type\": \"TextLabel\","
         "    \"text\": \"Touch me\","
-        "    \"styles\": [\"basic-text\"],"
+        "    \"styles\": [\"basicText\"],"
         "    \"position\": [0, -120, 0],"
         "    \"size\": [200, 200, 1],"
         "    \"orientation\": [0, 0, 30],"
         "    \"position\": [0, -120, 0],"
         "    \"size\": [200, 200, 1],"
         "    \"orientation\": [0, 0, 30],"
@@ -258,7 +258,7 @@ int UtcDaliBuilderAnimationP(void)
 
   DALI_TEST_CHECK( anim );
 
 
   DALI_TEST_CHECK( anim );
 
-  anim = builder.CreateAnimation("path-animation");
+  anim = builder.CreateAnimation("pathAnimation");
 
   DALI_TEST_CHECK( anim );
 
 
   DALI_TEST_CHECK( anim );
 
@@ -299,16 +299,16 @@ int UtcDaliBuilderAnimationN(void)
         "  \"animations\": {"
         "    \"animate\": {"
         "      \"loop\": true,"
         "  \"animations\": {"
         "    \"animate\": {"
         "      \"loop\": true,"
-        "      \"end-action\": \"BAKE\","
-        "      \"disconnect-action\": \"BAKE\","
+        "      \"endAction\": \"BAKE\","
+        "      \"disconnectAction\": \"BAKE\","
         "      \"properties\":"
         "      [{"
         "        \"actor\": \"{NAME}\","
         "        \"property\": \"positioninvalid\","
         "        \"value\": [300, 300, -1000],"
         "      \"properties\":"
         "      [{"
         "        \"actor\": \"{NAME}\","
         "        \"property\": \"positioninvalid\","
         "        \"value\": [300, 300, -1000],"
-        "        \"alpha-function\": \"EASE_IN_OUT\","
+        "        \"alphaFunction\": \"EASE_IN_OUT\","
         "        \"relative\": true,"
         "        \"relative\": true,"
-        "        \"time-period\": {"
+        "        \"timePeriod\": {"
         "          \"delay\": 0,"
         "          \"duration\": 3"
         "        }"
         "          \"delay\": 0,"
         "          \"duration\": 3"
         "        }"
@@ -317,32 +317,32 @@ int UtcDaliBuilderAnimationN(void)
         "    },"
         "    \"animate2\": {"
         "      \"loop\": true,"
         "    },"
         "    \"animate2\": {"
         "      \"loop\": true,"
-        "      \"end-action\": \"BAKE\","
-        "      \"disconnect-action\": \"BAKE\","
+        "      \"endAction\": \"BAKE\","
+        "      \"disconnectAction\": \"BAKE\","
         "      \"properties\":"
         "      [{"
         "        \"actor\": \"{NAME}\","
         "        \"property\": \"positioninvalid\","
         "        \"value\": [300, 300, -1000],"
         "      \"properties\":"
         "      [{"
         "        \"actor\": \"{NAME}\","
         "        \"property\": \"positioninvalid\","
         "        \"value\": [300, 300, -1000],"
-        "        \"alpha-function\": \"EGGS_OVER_EASY\","
+        "        \"alphaFunction\": \"EGGS_OVER_EASY\","
         "        \"relative\": true,"
         "        \"relative\": true,"
-        "        \"time-period\": {"
+        "        \"timePeriod\": {"
         "          \"delay\": 0,"
         "          \"duration\": 3"
         "        }"
         "      }"
         "      ]"
         "    },"
         "          \"delay\": 0,"
         "          \"duration\": 3"
         "        }"
         "      }"
         "      ]"
         "    },"
-        "    \"path-animation\": {"
+        "    \"pathAnimation\": {"
         "      \"duration\": 3.0,"
         "      \"duration\": 3.0,"
-        "      \"end-action\": \"DISCARD\","
-        "      \"disconnect-action\": \"BAKE_FINAL\","
+        "      \"endAction\": \"DISCARD\","
+        "      \"disconnectAction\": \"BAKE_FINAL\","
         "      \"properties\": [{"
         "        \"actor\": \"greeting\","
         "        \"path\":\"pathDoesntExist\","
         "        \"forward\":[1,0,0],"
         "      \"properties\": [{"
         "        \"actor\": \"greeting\","
         "        \"path\":\"pathDoesntExist\","
         "        \"forward\":[1,0,0],"
-        "        \"alpha-function\": \"EASE_IN_OUT\","
-        "        \"time-period\": {"
+        "        \"alphaFunction\": \"EASE_IN_OUT\","
+        "        \"timePeriod\": {"
         "          \"delay\": 0,"
         "          \"duration\": 3"
         "        }"
         "          \"delay\": 0,"
         "          \"duration\": 3"
         "        }"
@@ -353,7 +353,7 @@ int UtcDaliBuilderAnimationN(void)
         "    \"name\": \"greeting\","
         "    \"type\": \"TextLabel\","
         "    \"text\": \"Touch me\","
         "    \"name\": \"greeting\","
         "    \"type\": \"TextLabel\","
         "    \"text\": \"Touch me\","
-        "    \"styles\": [\"basic-text\"],"
+        "    \"styles\": [\"basicText\"],"
         "    \"position\": [0, -120, 0],"
         "    \"size\": [200, 200, 1],"
         "    \"orientation\": [0, 0, 30],"
         "    \"position\": [0, -120, 0],"
         "    \"size\": [200, 200, 1],"
         "    \"orientation\": [0, 0, 30],"
@@ -378,7 +378,7 @@ int UtcDaliBuilderAnimationN(void)
   Animation anim = builder.CreateAnimation("animate");
 
   // log warning line coverage
   Animation anim = builder.CreateAnimation("animate");
 
   // log warning line coverage
-  anim = builder.CreateAnimation("path-animation");
+  anim = builder.CreateAnimation("pathAnimation");
   DALI_TEST_CHECK(anim);
 
   anim = builder.CreateAnimation("animate");
   DALI_TEST_CHECK(anim);
 
   anim = builder.CreateAnimation("animate");
@@ -425,11 +425,11 @@ int UtcDaliBuilderConstantsP(void)
       "  \"type\": \"ImageActor\","
       "  \"name\": \"{NAME}\","
       "  \"size\": [100,100,1],"
       "  \"type\": \"ImageActor\","
       "  \"name\": \"{NAME}\","
       "  \"size\": [100,100,1],"
-      "  \"parent-origin\": \"TOP_LEFT\","
-      "  \"anchor-point\": \"{ANCHOR}\","
+      "  \"parentOrigin\": \"TOP_LEFT\","
+      "  \"anchorPoint\": \"{ANCHOR}\","
       "  \"padding\": \"{PADDING}\","
       "  \"image\": { \"filename\": \"dir/{IMAGE_PATH}\" },"
       "  \"padding\": \"{PADDING}\","
       "  \"image\": { \"filename\": \"dir/{IMAGE_PATH}\" },"
-      "  \"size-width\": \"{WIDTH}\","
+      "  \"sizeWidth\": \"{WIDTH}\","
       "  \"signals\": [{"
       "    \"name\": \"touched\","
       "    \"action\": \"quit\""
       "  \"signals\": [{"
       "    \"name\": \"touched\","
       "    \"action\": \"quit\""
@@ -479,11 +479,11 @@ int UtcDaliBuilderTemplatesAndStylesP(void)
       "},"
       "\"styles\":\n"
       "{\n"
       "},"
       "\"styles\":\n"
       "{\n"
-      "  \"image-style\": \n"
+      "  \"imageStyle\": \n"
       "  {\n"
       "    \"color\": [1,0,0,1],\n"
       "    \"actors\": {\n"
       "  {\n"
       "    \"color\": [1,0,0,1],\n"
       "    \"actors\": {\n"
-      "      \"child-image\": {\n"
+      "      \"childImage\": {\n"
       "        \"color\": [0,1,0,1]\n"
       "      }\n"
       "    }\n"
       "        \"color\": [0,1,0,1]\n"
       "      }\n"
       "    }\n"
@@ -491,9 +491,9 @@ int UtcDaliBuilderTemplatesAndStylesP(void)
       "},\n"
       "\"templates\":\n"
       "{\n"
       "},\n"
       "\"templates\":\n"
       "{\n"
-      "  \"image-tree\": { \n"
+      "  \"imageTree\": { \n"
       "    \"type\": \"ImageActor\",\n"
       "    \"type\": \"ImageActor\",\n"
-      "    \"styles\": [\"image-style\"],\n"
+      "    \"styles\": [\"imageStyle\"],\n"
       "    \"name\": \"image\",\n"
       "    \"size\": \"{SIZE}\",\n"
       "    \"signals\": [{\n"
       "    \"name\": \"image\",\n"
       "    \"size\": \"{SIZE}\",\n"
       "    \"signals\": [{\n"
@@ -503,14 +503,14 @@ int UtcDaliBuilderTemplatesAndStylesP(void)
       "    \"actors\": [\n"
       "      {\n"
       "        \"type\":\"ImageActor\",\n"
       "    \"actors\": [\n"
       "      {\n"
       "        \"type\":\"ImageActor\",\n"
-      "        \"name\":\"child-image\" \n"
+      "        \"name\":\"childImage\" \n"
       "      }\n"
       "    ]\n"
       "  }\n"
       "},\n"
       "\"stage\":"
       "[{"
       "      }\n"
       "    ]\n"
       "  }\n"
       "},\n"
       "\"stage\":"
       "[{"
-      "  \"type\": \"image-tree\","
+      "  \"type\": \"imageTree\","
       "  \"size\": [100,100,1]"
       "}]"
       "}\n"
       "  \"size\": [100,100,1]"
       "}]"
       "}\n"
@@ -520,7 +520,7 @@ int UtcDaliBuilderTemplatesAndStylesP(void)
     "{\n"
     " \"color\": [1,0,0,1],\n"
     " \"actors\": {\n"
     "{\n"
     " \"color\": [1,0,0,1],\n"
     " \"actors\": {\n"
-    "   \"child-image\": {\n"
+    "   \"childImage\": {\n"
     "     \"color\": [0,1,0,1]\n"
     "   }\n"
     " }\n"
     "     \"color\": [0,1,0,1]\n"
     "   }\n"
     " }\n"
@@ -530,7 +530,7 @@ int UtcDaliBuilderTemplatesAndStylesP(void)
   std::string templatejson(
     "{ \n"
     "  \"type\": \"ImageActor\",\n"
   std::string templatejson(
     "{ \n"
     "  \"type\": \"ImageActor\",\n"
-    "  \"styles\": [\"image-style\"],\n"
+    "  \"styles\": [\"imageStyle\"],\n"
     "  \"name\": \"image\",\n"
     "  \"size\": \"{SIZE}\",\n"
     "  \"signals\": [{\n"
     "  \"name\": \"image\",\n"
     "  \"size\": \"{SIZE}\",\n"
     "  \"signals\": [{\n"
@@ -540,7 +540,7 @@ int UtcDaliBuilderTemplatesAndStylesP(void)
     "  \"actors\": [\n"
     "    {\n"
     "      \"type\":\"ImageActor\",\n"
     "  \"actors\": [\n"
     "    {\n"
     "      \"type\":\"ImageActor\",\n"
-    "      \"name\":\"child-image\" \n"
+    "      \"name\":\"childImage\" \n"
     "    }\n"
     "  ]\n"
     "}\n"
     "    }\n"
     "  ]\n"
     "}\n"
@@ -549,12 +549,12 @@ int UtcDaliBuilderTemplatesAndStylesP(void)
   Builder builder = Builder::New();
   builder.LoadFromString( json );
 
   Builder builder = Builder::New();
   builder.LoadFromString( json );
 
-  ImageActor actor = ImageActor::DownCast( builder.Create( "image-tree" ) );
+  ImageActor actor = ImageActor::DownCast( builder.Create( "imageTree" ) );
   DALI_TEST_CHECK( actor );
 
   Dali::Property::Map map;
   map["SIZE"] = Vector3(100,100,1);
   DALI_TEST_CHECK( actor );
 
   Dali::Property::Map map;
   map["SIZE"] = Vector3(100,100,1);
-  actor = ImageActor::DownCast( builder.Create( "image-tree", map ) );
+  actor = ImageActor::DownCast( builder.Create( "imageTree",  map ) );
   DALI_TEST_CHECK( actor );
 
   // create from json snippet
   DALI_TEST_CHECK( actor );
 
   // create from json snippet
@@ -563,7 +563,7 @@ int UtcDaliBuilderTemplatesAndStylesP(void)
 
 
   // NB: already applied in create
 
 
   // NB: already applied in create
-  DALI_TEST_CHECK( builder.ApplyStyle( "image-style", actor ) );
+  DALI_TEST_CHECK( builder.ApplyStyle( "imageStyle",  actor ) );
 
   // apply from json snippet
   DALI_TEST_CHECK( builder.ApplyFromJson( actor, stylejson ) );
 
   // apply from json snippet
   DALI_TEST_CHECK( builder.ApplyFromJson( actor, stylejson ) );
@@ -578,11 +578,11 @@ int UtcDaliBuilderRenderTasksP(void)
   // JSON with a quit event when the actor is touched
   std::string json(
       "{\n"
   // JSON with a quit event when the actor is touched
   std::string json(
       "{\n"
-      "\"render-tasks\":\n"
+      "\"renderTasks\":\n"
       "{\n"
       "  \"task0\": {\n"
       "{\n"
       "  \"task0\": {\n"
-      "    \"source-actor\": \"image\",\n"
-      "    \"camera-actor\": \"camera\" \n"
+      "    \"sourceActor\": \"image\",\n"
+      "    \"cameraActor\": \"camera\" \n"
       "  }\n"
       "},\n"
       "\"stage\":\n"
       "  }\n"
       "},\n"
       "\"stage\":\n"
@@ -602,7 +602,7 @@ int UtcDaliBuilderRenderTasksP(void)
       "    \"actors\": [\n"
       "      {\n"
       "        \"type\":\"ImageActor\",\n"
       "    \"actors\": [\n"
       "      {\n"
       "        \"type\":\"ImageActor\",\n"
-      "        \"name\":\"child-image\" \n"
+      "        \"name\":\"childImage\" \n"
       "      }\n"
       "    ]\n"
       "  }\n"
       "      }\n"
       "    ]\n"
       "  }\n"
@@ -636,17 +636,17 @@ int UtcDaliBuilderChildActionP(void)
       "    \"type\": \"Actor\",\n"
       "    \"name\": \"actor\",\n"
       "    \"size\": [100,100,1],\n"
       "    \"type\": \"Actor\",\n"
       "    \"name\": \"actor\",\n"
       "    \"size\": [100,100,1],\n"
-      "    \"parent-origin\": \"TOP_LEFT\",\n"
-      "    \"anchor-point\": \"TOP_LEFT\",\n"
+      "    \"parentOrigin\": \"TOP_LEFT\",\n"
+      "    \"anchorPoint\": \"TOP_LEFT\",\n"
       "    \"actors\": [{\n"
       "      \"type\": \"Actor\",\n"
       "    \"actors\": [{\n"
       "      \"type\": \"Actor\",\n"
-      "      \"name\": \"sub-actor\"\n"
+      "      \"name\": \"subActor\"\n"
       "    }],\n"
       "    \"signals\": [{\n"
       "      \"name\": \"touched\",\n"
       "      \"action\": \"hide\",\n"
       "      \"actor\": \"actor\",\n"
       "    }],\n"
       "    \"signals\": [{\n"
       "      \"name\": \"touched\",\n"
       "      \"action\": \"hide\",\n"
       "      \"actor\": \"actor\",\n"
-      "      \"child-actor\": \"sub-actor\"\n"
+      "      \"childActor\": \"subActor\"\n"
       "    }]\n"
       "  }]\n"
       "}\n"
       "    }]\n"
       "  }]\n"
       "}\n"
@@ -669,7 +669,7 @@ int UtcDaliBuilderChildActionP(void)
   application.SendNotification();
   application.Render();
 
   application.SendNotification();
   application.Render();
 
-  Actor actor = Stage::GetCurrent().GetRootLayer().FindChildByName("sub-actor");
+  Actor actor = Stage::GetCurrent().GetRootLayer().FindChildByName("subActor");
   DALI_TEST_CHECK( actor );
 
   DALI_TEST_CHECK( !actor.IsVisible() );
   DALI_TEST_CHECK( actor );
 
   DALI_TEST_CHECK( !actor.IsVisible() );
@@ -689,16 +689,16 @@ int UtcDaliBuilderSetPropertyActionP(void)
       "    \"type\": \"Actor\",\n"
       "    \"name\": \"actor\",\n"
       "    \"size\": [100,100,1],\n"
       "    \"type\": \"Actor\",\n"
       "    \"name\": \"actor\",\n"
       "    \"size\": [100,100,1],\n"
-      "    \"parent-origin\": \"TOP_LEFT\",\n"
-      "    \"anchor-point\": \"TOP_LEFT\",\n"
+      "    \"parentOrigin\": \"TOP_LEFT\",\n"
+      "    \"anchorPoint\": \"TOP_LEFT\",\n"
       "    \"actors\": [{\n"
       "      \"type\": \"Actor\",\n"
       "    \"actors\": [{\n"
       "      \"type\": \"Actor\",\n"
-      "      \"name\": \"sub-actor\"\n"
+      "      \"name\": \"subActor\"\n"
       "    }],\n"
       "    \"signals\": [{\n"
       "      \"name\": \"touched\",\n"
       "      \"action\": \"set\",\n"
       "    }],\n"
       "    \"signals\": [{\n"
       "      \"name\": \"touched\",\n"
       "      \"action\": \"set\",\n"
-      "      \"actor\": \"sub-actor\",\n"
+      "      \"actor\": \"subActor\",\n"
       "      \"property\": \"visible\",\n"
       "      \"value\": false\n"
       "    }]\n"
       "      \"property\": \"visible\",\n"
       "      \"value\": false\n"
       "    }]\n"
@@ -723,7 +723,7 @@ int UtcDaliBuilderSetPropertyActionP(void)
   application.SendNotification();
   application.Render();
 
   application.SendNotification();
   application.Render();
 
-  Actor actor = Stage::GetCurrent().GetRootLayer().FindChildByName("sub-actor");
+  Actor actor = Stage::GetCurrent().GetRootLayer().FindChildByName("subActor");
   DALI_TEST_CHECK( actor );
 
   DALI_TEST_CHECK( !actor.IsVisible() );
   DALI_TEST_CHECK( actor );
 
   DALI_TEST_CHECK( !actor.IsVisible() );
@@ -743,11 +743,11 @@ int UtcDaliBuilderGenericActionP(void)
       "    \"type\": \"Actor\",\n"
       "    \"name\": \"actor\",\n"
       "    \"size\": [100,100,1],\n"
       "    \"type\": \"Actor\",\n"
       "    \"name\": \"actor\",\n"
       "    \"size\": [100,100,1],\n"
-      "    \"parent-origin\": \"TOP_LEFT\",\n"
-      "    \"anchor-point\": \"TOP_LEFT\",\n"
+      "    \"parentOrigin\": \"TOP_LEFT\",\n"
+      "    \"anchorPoint\": \"TOP_LEFT\",\n"
       "    \"actors\": [{\n"
       "      \"type\": \"Actor\",\n"
       "    \"actors\": [{\n"
       "      \"type\": \"Actor\",\n"
-      "      \"name\": \"sub-actor\"\n"
+      "      \"name\": \"subActor\"\n"
       "    }],\n"
       "    \"signals\": [{\n"
       "      \"name\": \"touched\",\n"
       "    }],\n"
       "    \"signals\": [{\n"
       "      \"name\": \"touched\",\n"
@@ -794,11 +794,11 @@ int UtcDaliBuilderPropertyNotificationP(void)
       "    \"type\": \"Actor\",\n"
       "    \"name\": \"actor\",\n"
       "    \"size\": [100,100,1],\n"
       "    \"type\": \"Actor\",\n"
       "    \"name\": \"actor\",\n"
       "    \"size\": [100,100,1],\n"
-      "    \"parent-origin\": \"TOP_LEFT\",\n"
-      "    \"anchor-point\": \"TOP_LEFT\",\n"
+      "    \"parentOrigin\": \"TOP_LEFT\",\n"
+      "    \"anchorPoint\": \"TOP_LEFT\",\n"
       "    \"actors\": [{\n"
       "      \"type\": \"Actor\",\n"
       "    \"actors\": [{\n"
       "      \"type\": \"Actor\",\n"
-      "      \"name\": \"sub-actor\"\n"
+      "      \"name\": \"subActor\"\n"
       "    }],\n"
       "    \"signals\": [{\n"
       "      \"name\": \"touched\",\n"
       "    }],\n"
       "    \"signals\": [{\n"
       "      \"name\": \"touched\",\n"
@@ -851,7 +851,7 @@ int UtcDaliBuilderCustomPropertyP(void)
       "{\n"
       "\"templates\":\n"
       "{\n"
       "{\n"
       "\"templates\":\n"
       "{\n"
-      "  \"image-tree\": { \n"
+      "  \"imageTree\": { \n"
       "    \"type\": \"ImageActor\",\n"
       "    \"name\": \"image\",\n"
       "    \"size\": [100,100,1],\n"
       "    \"type\": \"ImageActor\",\n"
       "    \"name\": \"image\",\n"
       "    \"size\": [100,100,1],\n"
@@ -859,13 +859,13 @@ int UtcDaliBuilderCustomPropertyP(void)
       "      \"name\": \"touched\",\n"
       "      \"action\": \"quit\"\n"
       "    }],\n"
       "      \"name\": \"touched\",\n"
       "      \"action\": \"quit\"\n"
       "    }],\n"
-      "    \"custom-properties\": {\n"
+      "    \"customProperties\": {\n"
       "      \"newproperty\": true\n"
       "    },\n"
       "    \"actors\": [\n"
       "      {\n"
       "        \"type\":\"ImageActor\",\n"
       "      \"newproperty\": true\n"
       "    },\n"
       "    \"actors\": [\n"
       "      {\n"
       "        \"type\":\"ImageActor\",\n"
-      "        \"name\":\"child-image\" \n"
+      "        \"name\":\"childImage\" \n"
       "      }\n"
       "    ]\n"
       "  }\n"
       "      }\n"
       "    ]\n"
       "  }\n"
@@ -876,7 +876,7 @@ int UtcDaliBuilderCustomPropertyP(void)
   Builder builder = Builder::New();
   builder.LoadFromString( json );
 
   Builder builder = Builder::New();
   builder.LoadFromString( json );
 
-  ImageActor actor = ImageActor::DownCast( builder.Create( "image-tree" ) );
+  ImageActor actor = ImageActor::DownCast( builder.Create( "imageTree" ) );
   DALI_TEST_CHECK( actor );
 
   // NB: already applied in create
   DALI_TEST_CHECK( actor );
 
   // NB: already applied in create
@@ -904,19 +904,19 @@ int UtcDaliBuilderShaderEffectP(void)
     "        0.9150390625,\n"
     "        0.0\n"
     "      ],\n"
     "        0.9150390625,\n"
     "        0.0\n"
     "      ],\n"
-    "      \"parent-origin\": [0.5, 0.5, 0.5],\n"
+    "      \"parentOrigin\": [0.5, 0.5, 0.5],\n"
     "      \"size\": [200, 200, 0],\n"
     "      \"effect\": \"Ripple2D\",\n"
     "      \"image\": {\n"
     "        \"filename\": \"{DALI_IMAGE_DIR}gallery-medium-25.jpg\",\n"
     "        \"width\": 200,\n"
     "        \"height\": 80,\n"
     "      \"size\": [200, 200, 0],\n"
     "      \"effect\": \"Ripple2D\",\n"
     "      \"image\": {\n"
     "        \"filename\": \"{DALI_IMAGE_DIR}gallery-medium-25.jpg\",\n"
     "        \"width\": 200,\n"
     "        \"height\": 80,\n"
-    "        \"load-policy\": \"IMMEDIATE\",\n"
-    "        \"release-policy\": \"NEVER\"\n"
+    "        \"loadPolicy\": \"IMMEDIATE\",\n"
+    "        \"releasePolicy\": \"NEVER\"\n"
     "      },\n"
     "      \"signals\": [\n"
     "        {\n"
     "      },\n"
     "      \"signals\": [\n"
     "        {\n"
-    "          \"name\": \"on-stage\",\n"
+    "          \"name\": \"onStage\",\n"
     "          \"action\": \"play\",\n"
     "          \"animation\": \"Animation_1\"\n"
     "        }\n"
     "          \"action\": \"play\",\n"
     "          \"animation\": \"Animation_1\"\n"
     "        }\n"
@@ -932,8 +932,8 @@ int UtcDaliBuilderShaderEffectP(void)
     "          \"actor\": \"Image1\",\n"
     "          \"property\": \"uTime\",\n"
     "          \"value\": 10.0,\n"
     "          \"actor\": \"Image1\",\n"
     "          \"property\": \"uTime\",\n"
     "          \"value\": 10.0,\n"
-    "          \"alpha-function\": \"LINEAR\",\n"
-    "          \"time-period\": {\n"
+    "          \"alphaFunction\": \"LINEAR\",\n"
+    "          \"timePeriod\": {\n"
     "            \"delay\": 0,\n"
     "            \"duration\": 10.0\n"
     "          },\n"
     "            \"delay\": 0,\n"
     "            \"duration\": 10.0\n"
     "          },\n"
@@ -942,17 +942,17 @@ int UtcDaliBuilderShaderEffectP(void)
     "      ]\n"
     "    }\n"
     "  },\n"
     "      ]\n"
     "    }\n"
     "  },\n"
-    "  \"shader-effects\": {\n"
+    "  \"shaderEffects\": {\n"
     "    \"Ripple2D\": {\n"
     "      \"program\": {\n"
     "        \"vertexPrefix\": \"\",\n"
     "        \"vertex\": \"void main(void)\\n{\\n  gl_Position = uProjection * uModelView * vec4(aPosition, 1.0);\\n  vTexCoord = aTexCoord;\\n}\\n\\n\",\n"
     "        \"fragmentPrefix\": \"\",\n"
     "        \"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\",\n"
     "    \"Ripple2D\": {\n"
     "      \"program\": {\n"
     "        \"vertexPrefix\": \"\",\n"
     "        \"vertex\": \"void main(void)\\n{\\n  gl_Position = uProjection * uModelView * vec4(aPosition, 1.0);\\n  vTexCoord = aTexCoord;\\n}\\n\\n\",\n"
     "        \"fragmentPrefix\": \"\",\n"
     "        \"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\",\n"
-    "        \"geometry-type\": \"GEOMETRY_TYPE_IMAGE\"\n"
+    "        \"geometryType\": \"GEOMETRY_TYPE_IMAGE\"\n"
     "      },\n"
     "      },\n"
-    "      \"geometry-hints\": \"HINT_NONE\",\n"
-    "      \"grid-density\": 0,\n"
+    "      \"geometryHints\": \"HINT_NONE\",\n"
+    "      \"gridDensity\": 0,\n"
     "      \"loop\": true,\n"
     "      \"uAmplitude\": 0.02,\n"
     "      \"uTime\": 0.0\n"
     "      \"loop\": true,\n"
     "      \"uAmplitude\": 0.02,\n"
     "      \"uTime\": 0.0\n"
@@ -985,8 +985,8 @@ int UtcDaliBuilderLoadFromStringN(void)
          "[{"
            "\"type\": \"Actor\","
            "\"size\": [100,100,1],"
          "[{"
            "\"type\": \"Actor\","
            "\"size\": [100,100,1],"
-           "\"parent-origin\": \"TOP_LEFT\","
-           "\"anchor-point\": \"TOP_LEFT\","
+           "\"parentOrigin\": \"TOP_LEFT\","
+           "\"anchorPoint\": \"TOP_LEFT\","
            "\"signals\": [{"
              "\"name\": \"touched\","
              "\"action\": \"quit\""
            "\"signals\": [{"
              "\"name\": \"touched\","
              "\"action\": \"quit\""
@@ -1023,10 +1023,10 @@ int UtcDaliBuilderShaderEffect2P(void)
     "{\n"
     "\"templates\":\n"
     "{\n"
     "{\n"
     "\"templates\":\n"
     "{\n"
-    "  \"image-tree\": { \n"
+    "  \"imageTree\": { \n"
     "    \"type\": \"ImageActor\",\n"
     "    \"size\": [100,100,1],\n"
     "    \"type\": \"ImageActor\",\n"
     "    \"size\": [100,100,1],\n"
-    "    \"parent-origin\": [0.5, 0.5, 0.5],\n"
+    "    \"parentOrigin\": [0.5, 0.5, 0.5],\n"
     "    \"position\": [\n"
     "      0.40461349487305,\n"
     "      0.9150390625,\n"
     "    \"position\": [\n"
     "      0.40461349487305,\n"
     "      0.9150390625,\n"
@@ -1039,39 +1039,39 @@ int UtcDaliBuilderShaderEffect2P(void)
     "    \"actors\": [\n"
     "      {\n"
     "        \"type\":\"ImageActor\",\n"
     "    \"actors\": [\n"
     "      {\n"
     "        \"type\":\"ImageActor\",\n"
-    "        \"name\":\"child-image\" \n"
+    "        \"name\":\"childImage\" \n"
     "      }\n"
     "    ]\n"
     "  }\n"
     "},\n"
     "  \"stage\": [\n"
     "    {\n"
     "      }\n"
     "    ]\n"
     "  }\n"
     "},\n"
     "  \"stage\": [\n"
     "    {\n"
-    "      \"type\": \"image-tree\",\n"
+    "      \"type\": \"imageTree\",\n"
     "      \"name\": \"Image1\",\n"
     "      \"effect\": \"Ripple2D\",\n"
     "      \"image\": \"offscreen\""
     "    }\n"
     "  ],\n"
     "      \"name\": \"Image1\",\n"
     "      \"effect\": \"Ripple2D\",\n"
     "      \"image\": \"offscreen\""
     "    }\n"
     "  ],\n"
-    "  \"shader-effects\": {\n"
+    "  \"shaderEffects\": {\n"
     "    \"Ripple2D\": {\n"
     "      \"program\": {\n"
     "        \"vertexPrefix\": \"\",\n"
     "        \"vertex\": \"void main(void)\\n{\\n  gl_Position = uProjection * uModelView * vec4(aPosition, 1.0);\\n  vTexCoord = aTexCoord;\\n}\\n\\n\",\n"
     "        \"fragmentPrefix\": \"\",\n"
     "        \"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\",\n"
     "    \"Ripple2D\": {\n"
     "      \"program\": {\n"
     "        \"vertexPrefix\": \"\",\n"
     "        \"vertex\": \"void main(void)\\n{\\n  gl_Position = uProjection * uModelView * vec4(aPosition, 1.0);\\n  vTexCoord = aTexCoord;\\n}\\n\\n\",\n"
     "        \"fragmentPrefix\": \"\",\n"
     "        \"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\",\n"
-    "        \"geometry-type\": \"GEOMETRY_TYPE_IMAGE\"\n"
+    "        \"geometryType\": \"GEOMETRY_TYPE_IMAGE\"\n"
     "      },\n"
     "      },\n"
-    "      \"geometry-hints\": \"HINT_NONE\",\n"
-    "      \"grid-density\": 0,\n"
+    "      \"geometryHints\": \"HINT_NONE\",\n"
+    "      \"gridDensity\": 0,\n"
     "      \"loop\": true,\n"
     "      \"uAmplitude\": 0.02,\n"
     "      \"uTime\": 0.0\n"
     "    }\n"
     "  },\n"
     "      \"loop\": true,\n"
     "      \"uAmplitude\": 0.02,\n"
     "      \"uTime\": 0.0\n"
     "    }\n"
     "  },\n"
-    "  \"frame-buffer-images\": {\n"
+    "  \"frameBufferImages\": {\n"
     "    \"offscreen\": {\n"
     "      \"type\": \"FrameBufferImage\","
     "    \"offscreen\": {\n"
     "      \"type\": \"FrameBufferImage\","
-    "      \"pixel-format\":\"RGBA8888\","
+    "      \"pixelFormat\":\"RGBA8888\","
     "      \"width\": 400,"
     "      \"height\": 400"
     "    }"
     "      \"width\": 400,"
     "      \"height\": 400"
     "    }"
@@ -1101,18 +1101,18 @@ int UtcDaliBuilderAddActorsP(void)
       "    \"type\": \"Actor\",\n"
       "    \"name\": \"actor\",\n"
       "    \"size\": [100,100,1],\n"
       "    \"type\": \"Actor\",\n"
       "    \"name\": \"actor\",\n"
       "    \"size\": [100,100,1],\n"
-      "    \"parent-origin\": \"TOP_LEFT\",\n"
-      "    \"anchor-point\": \"TOP_LEFT\",\n"
+      "    \"parentOrigin\": \"TOP_LEFT\",\n"
+      "    \"anchorPoint\": \"TOP_LEFT\",\n"
       "    \"actors\": [{\n"
       "      \"type\": \"Actor\",\n"
       "    \"actors\": [{\n"
       "      \"type\": \"Actor\",\n"
-      "      \"name\": \"sub-actor\",\n"
+      "      \"name\": \"subActor\",\n"
       "      \"visible\": false\n"
       "    }],\n"
       "    \"signals\": [{\n"
       "      \"name\": \"touched\",\n"
       "      \"action\": \"hide\",\n"
       "      \"actor\": \"actor\",\n"
       "      \"visible\": false\n"
       "    }],\n"
       "    \"signals\": [{\n"
       "      \"name\": \"touched\",\n"
       "      \"action\": \"hide\",\n"
       "      \"actor\": \"actor\",\n"
-      "      \"child-actor\": \"sub-actor\"\n"
+      "      \"childActor\": \"subActor\"\n"
       "    }]\n"
       "  }]\n"
       "}\n"
       "    }]\n"
       "  }]\n"
       "}\n"
@@ -1126,7 +1126,7 @@ int UtcDaliBuilderAddActorsP(void)
   application.SendNotification();
   application.Render();
 
   application.SendNotification();
   application.Render();
 
-  Actor actor = Stage::GetCurrent().GetRootLayer().FindChildByName("sub-actor");
+  Actor actor = Stage::GetCurrent().GetRootLayer().FindChildByName("subActor");
   DALI_TEST_CHECK( actor );
 
   DALI_TEST_CHECK( !actor.IsVisible() );
   DALI_TEST_CHECK( actor );
 
   DALI_TEST_CHECK( !actor.IsVisible() );
@@ -1157,27 +1157,27 @@ int UtcDaliBuilderFrameBufferP(void)
     "        0.9150390625,\n"
     "        0.0\n"
     "      ],\n"
     "        0.9150390625,\n"
     "        0.0\n"
     "      ],\n"
-    "      \"parent-origin\": [0.5, 0.5, 0.5],\n"
+    "      \"parentOrigin\": [0.5, 0.5, 0.5],\n"
     "      \"size\": [300, 300, 0],\n"
     "      \"image\": \"fb0\",\n"
     "      \"size\": [300, 300, 0],\n"
     "      \"image\": \"fb0\",\n"
-    "      \"clear-color\": [1,0,0,1]\n"
+    "      \"clearColor\": [1,0,0,1]\n"
     "    },\n"
     "    {\n"
     "      \"type\": \"ImageActor\",\n"
     "      \"name\": \"Image1\",\n"
     "      \"size\": [200, 200, 0],\n"
     "    },\n"
     "    {\n"
     "      \"type\": \"ImageActor\",\n"
     "      \"name\": \"Image1\",\n"
     "      \"size\": [200, 200, 0],\n"
-    "      \"parent-origin\": [0.5, 0.5, 0.5],\n"
+    "      \"parentOrigin\": [0.5, 0.5, 0.5],\n"
     "      \"effect\": \"Ripple2D\",\n"
     "      \"image\": {\n"
     "        \"filename\": \"{DALI_IMAGE_DIR}gallery-medium-25.jpg\",\n"
     "        \"width\": 200,\n"
     "        \"height\": 80,\n"
     "      \"effect\": \"Ripple2D\",\n"
     "      \"image\": {\n"
     "        \"filename\": \"{DALI_IMAGE_DIR}gallery-medium-25.jpg\",\n"
     "        \"width\": 200,\n"
     "        \"height\": 80,\n"
-    "        \"load-policy\": \"IMMEDIATE\",\n"
-    "        \"release-policy\": \"NEVER\"\n"
+    "        \"loadPolicy\": \"IMMEDIATE\",\n"
+    "        \"releasePolicy\": \"NEVER\"\n"
     "      },\n"
     "      \"signals\": [\n"
     "        {\n"
     "      },\n"
     "      \"signals\": [\n"
     "        {\n"
-    "          \"name\": \"on-stage\",\n"
+    "          \"name\": \"onStage\",\n"
     "          \"action\": \"play\",\n"
     "          \"animation\": \"Animation_1\"\n"
     "        }\n"
     "          \"action\": \"play\",\n"
     "          \"animation\": \"Animation_1\"\n"
     "        }\n"
@@ -1186,33 +1186,33 @@ int UtcDaliBuilderFrameBufferP(void)
     "    {\n"
     "      \"type\":\"CameraActor\",\n"
     "      \"name\":\"fbCam\",\n"
     "    {\n"
     "      \"type\":\"CameraActor\",\n"
     "      \"name\":\"fbCam\",\n"
-    "      \"aspect-ratio\": \"{FB_ASPECT_RATIO}\",\n"
-    "      \"projection-mode\": \"PERSPECTIVE_PROJECTION\",\n"
-    "      \"field-of-view\": 0.785,\n"
-    "      \"invert-y-axis\": true\n"
+    "      \"aspectRatio\": \"{FB_ASPECT_RATIO}\",\n"
+    "      \"projectionMode\": \"PERSPECTIVE_PROJECTION\",\n"
+    "      \"fieldOfView\": 0.785,\n"
+    "      \"invertYAxis\": true\n"
     "    }\n"
     "  ],\n"
     "    }\n"
     "  ],\n"
-    "  \"frame-buffer-images\":\n"
+    "  \"frameBufferImages\":\n"
     "  {\n"
     "    \"fb0\":\n"
     "    {\n"
     "      \"type\": \"FrameBufferImage\",\n"
     "  {\n"
     "    \"fb0\":\n"
     "    {\n"
     "      \"type\": \"FrameBufferImage\",\n"
-    "      \"width\": { \"type-cast\":\"float\", \"value\":\"{FB_WIDTH}\" },\n"
-    "      \"height\": { \"type-cast\":\"float\", \"value\":\"{FB_HEIGHT}\" }\n"
+    "      \"width\": { \"typeCast\":\"float\", \"value\":\"{FB_WIDTH}\" },\n"
+    "      \"height\": { \"typeCast\":\"float\", \"value\":\"{FB_HEIGHT}\" }\n"
     "    }\n"
     "  },\n"
     "    }\n"
     "  },\n"
-    "  \"render-tasks\":\n"
+    "  \"renderTasks\":\n"
     "  {\n"
     "    \"stage\":\n"
     "    [\n"
     "      {\n"
     "  {\n"
     "    \"stage\":\n"
     "    [\n"
     "      {\n"
-    "        \"source-actor\": \"fbOnStage\"\n"
+    "        \"sourceActor\": \"fbOnStage\"\n"
     "      },\n"
     "      {\n"
     "      },\n"
     "      {\n"
-    "        \"source-actor\": \"Image1\",\n"
-    "        \"target-frame-buffer\": \"fb0\",\n"
-    "        \"viewport-size\":\"{FB_SIZE}\",\n"
-    "        \"camera-actor\":\"fbCam\"\n"
+    "        \"sourceActor\": \"Image1\",\n"
+    "        \"targetFrameBuffer\": \"fb0\",\n"
+    "        \"viewportSize\":\"{FB_SIZE}\",\n"
+    "        \"cameraActor\":\"fbCam\"\n"
     "      }\n"
     "    ]\n"
     "  },\n"
     "      }\n"
     "    ]\n"
     "  },\n"
@@ -1225,8 +1225,8 @@ int UtcDaliBuilderFrameBufferP(void)
     "          \"actor\": \"Image1\",\n"
     "          \"property\": \"uTime\",\n"
     "          \"value\": 10.0,\n"
     "          \"actor\": \"Image1\",\n"
     "          \"property\": \"uTime\",\n"
     "          \"value\": 10.0,\n"
-    "          \"alpha-function\": \"LINEAR\",\n"
-    "          \"time-period\": {\n"
+    "          \"alphaFunction\": \"LINEAR\",\n"
+    "          \"timePeriod\": {\n"
     "            \"delay\": 0,\n"
     "            \"duration\": 10.0\n"
     "          },\n"
     "            \"delay\": 0,\n"
     "            \"duration\": 10.0\n"
     "          },\n"
@@ -1235,17 +1235,17 @@ int UtcDaliBuilderFrameBufferP(void)
     "      ]\n"
     "    }\n"
     "  },\n"
     "      ]\n"
     "    }\n"
     "  },\n"
-    "  \"shader-effects\": {\n"
+    "  \"shaderEffects\": {\n"
     "    \"Ripple2D\": {\n"
     "      \"program\": {\n"
     "        \"vertexPrefix\": \"\",\n"
     "        \"vertex\": \"void main(void)\\n{\\n  gl_Position = uProjection * uModelView * vec4(aPosition, 1.0);\\n  vTexCoord = aTexCoord;\\n}\\n\\n\",\n"
     "        \"fragmentPrefix\": \"\",\n"
     "        \"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\",\n"
     "    \"Ripple2D\": {\n"
     "      \"program\": {\n"
     "        \"vertexPrefix\": \"\",\n"
     "        \"vertex\": \"void main(void)\\n{\\n  gl_Position = uProjection * uModelView * vec4(aPosition, 1.0);\\n  vTexCoord = aTexCoord;\\n}\\n\\n\",\n"
     "        \"fragmentPrefix\": \"\",\n"
     "        \"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\",\n"
-    "        \"geometry-type\": \"GEOMETRY_TYPE_IMAGE\"\n"
+    "        \"geometryType\": \"GEOMETRY_TYPE_IMAGE\"\n"
     "      },\n"
     "      },\n"
-    "      \"geometry-hints\": \"HINT_NONE\",\n"
-    "      \"grid-density\": 0,\n"
+    "      \"geometryHints\": \"HINT_NONE\",\n"
+    "      \"gridDensity\": 0,\n"
     "      \"loop\": true,\n"
     "      \"uAmplitude\": 0.02,\n"
     "      \"uTime\": 0.0\n"
     "      \"loop\": true,\n"
     "      \"uAmplitude\": 0.02,\n"
     "      \"uTime\": 0.0\n"
@@ -1293,47 +1293,47 @@ int UtcDaliBuilderPathConstraintsP(void)
     "      \"type\": \"ImageActor\",\n"
     "      \"name\": \"Image1\",\n"
     "      \"size\": [200, 200, 0],\n"
     "      \"type\": \"ImageActor\",\n"
     "      \"name\": \"Image1\",\n"
     "      \"size\": [200, 200, 0],\n"
-    "      \"parent-origin\": [0.5, 0.5, 0.5],\n"
+    "      \"parentOrigin\": [0.5, 0.5, 0.5],\n"
     "      \"effect\": \"Ripple2D\",\n"
     "      \"image\": {\n"
     "        \"filename\": \"{DALI_IMAGE_DIR}gallery-medium-25.jpg\",\n"
     "        \"width\": 200,\n"
     "        \"height\": 80,\n"
     "      \"effect\": \"Ripple2D\",\n"
     "      \"image\": {\n"
     "        \"filename\": \"{DALI_IMAGE_DIR}gallery-medium-25.jpg\",\n"
     "        \"width\": 200,\n"
     "        \"height\": 80,\n"
-    "        \"load-policy\": \"IMMEDIATE\",\n"
-    "        \"release-policy\": \"NEVER\"\n"
+    "        \"loadPolicy\": \"IMMEDIATE\",\n"
+    "        \"releasePolicy\": \"NEVER\"\n"
     "      },\n"
     "      \"signals\": [\n"
     "        {\n"
     "      },\n"
     "      \"signals\": [\n"
     "        {\n"
-    "          \"name\": \"on-stage\",\n"
+    "          \"name\": \"onStage\",\n"
     "          \"action\": \"play\",\n"
     "          \"action\": \"play\",\n"
-    "          \"animation\": \"path-animation\"\n"
+    "          \"animation\": \"pathAnimation\"\n"
     "        },\n"
     "        {\n"
     "        },\n"
     "        {\n"
-    "          \"name\": \"on-stage\",\n"
+    "          \"name\": \"onStage\",\n"
     "          \"action\": \"applyConstraint\",\n"
     "          \"constrainer\": \"constrainer0\",\n"
     "          \"properties\":\n"
     "          [\n"
     "            {\n"
     "              \"source\": \"Image1\",\n"
     "          \"action\": \"applyConstraint\",\n"
     "          \"constrainer\": \"constrainer0\",\n"
     "          \"properties\":\n"
     "          [\n"
     "            {\n"
     "              \"source\": \"Image1\",\n"
-    "              \"sourceProperty\": \"position-x\",\n"
+    "              \"sourceProperty\": \"positionX\",\n"
     "              \"target\": \"Image1\",\n"
     "              \"target\": \"Image1\",\n"
-    "              \"targetProperty\": \"color-red\",\n"
+    "              \"targetProperty\": \"colorRed\",\n"
     "              \"range\": [-300,300]\n"
     "            }\n"
     "          ]\n"
     "        },\n"
     "        {\n"
     "              \"range\": [-300,300]\n"
     "            }\n"
     "          ]\n"
     "        },\n"
     "        {\n"
-    "          \"name\": \"on-stage\",\n"
+    "          \"name\": \"onStage\",\n"
     "          \"action\": \"applyConstraint\",\n"
     "          \"constrainer\": \"constrainer1\",\n"
     "          \"properties\":\n"
     "          [\n"
     "            {\n"
     "              \"source\": \"Image1\",\n"
     "          \"action\": \"applyConstraint\",\n"
     "          \"constrainer\": \"constrainer1\",\n"
     "          \"properties\":\n"
     "          [\n"
     "            {\n"
     "              \"source\": \"Image1\",\n"
-    "              \"sourceProperty\": \"position-x\",\n"
+    "              \"sourceProperty\": \"positionX\",\n"
     "              \"target\": \"Image1\",\n"
     "              \"target\": \"Image1\",\n"
-    "              \"targetProperty\": \"color-blue\",\n"
+    "              \"targetProperty\": \"colorBlue\",\n"
     "              \"range\": [-300,300]\n"
     "            }\n"
     "          ]\n"
     "              \"range\": [-300,300]\n"
     "            }\n"
     "          ]\n"
@@ -1355,7 +1355,7 @@ int UtcDaliBuilderPathConstraintsP(void)
     "    {\n"
     "      \"type\": \"PathConstrainer\",\n"
     "      \"points\": [ [0, 0, 0], [0,0,0], [0,0,0] ],\n"
     "    {\n"
     "      \"type\": \"PathConstrainer\",\n"
     "      \"points\": [ [0, 0, 0], [0,0,0], [0,0,0] ],\n"
-    "      \"control-points\": [ [0, 0, 0], [0,0,0], [0,0,0] ]\n"
+    "      \"controlPoints\": [ [0, 0, 0], [0,0,0], [0,0,0] ]\n"
     "    },\n"
     "    \"constrainer1\":\n"
     "    {\n"
     "    },\n"
     "    \"constrainer1\":\n"
     "    {\n"
@@ -1364,15 +1364,15 @@ int UtcDaliBuilderPathConstraintsP(void)
     "    }\n"
     "  },\n"
     "  \"animations\": {\n"
     "    }\n"
     "  },\n"
     "  \"animations\": {\n"
-    "    \"path-animation\": {\n"
+    "    \"pathAnimation\": {\n"
     "      \"duration\": 3.0,\n"
     "      \"properties\":\n"
     "      [{\n"
     "        \"actor\": \"Image1\",\n"
     "        \"path\":\"path0\",\n"
     "        \"forward\":[1,0,0],\n"
     "      \"duration\": 3.0,\n"
     "      \"properties\":\n"
     "      [{\n"
     "        \"actor\": \"Image1\",\n"
     "        \"path\":\"path0\",\n"
     "        \"forward\":[1,0,0],\n"
-    "        \"alpha-function\": \"EASE_IN_OUT\",\n"
-    "        \"time-period\": {\n"
+    "        \"alphaFunction\": \"EASE_IN_OUT\",\n"
+    "        \"timePeriod\": {\n"
     "          \"delay\": 0,\n"
     "          \"duration\": 3\n"
     "        }\n"
     "          \"delay\": 0,\n"
     "          \"duration\": 3\n"
     "        }\n"
@@ -1381,8 +1381,8 @@ int UtcDaliBuilderPathConstraintsP(void)
     "         \"actor\": \"Image1\",\n"
     "         \"property\": \"uTime\",\n"
     "         \"value\": 10.0,\n"
     "         \"actor\": \"Image1\",\n"
     "         \"property\": \"uTime\",\n"
     "         \"value\": 10.0,\n"
-    "         \"alpha-function\": \"LINEAR\",\n"
-    "         \"time-period\": {\n"
+    "         \"alphaFunction\": \"LINEAR\",\n"
+    "         \"timePeriod\": {\n"
     "           \"delay\": 0,\n"
     "           \"duration\": 10.0\n"
     "         },\n"
     "           \"delay\": 0,\n"
     "           \"duration\": 10.0\n"
     "         },\n"
@@ -1396,8 +1396,8 @@ int UtcDaliBuilderPathConstraintsP(void)
     "          \"actor\": \"Image1\",\n"
     "          \"property\": \"uTime\",\n"
     "          \"value\": 10.0,\n"
     "          \"actor\": \"Image1\",\n"
     "          \"property\": \"uTime\",\n"
     "          \"value\": 10.0,\n"
-    "          \"alpha-function\": \"LINEAR\",\n"
-    "          \"time-period\": {\n"
+    "          \"alphaFunction\": \"LINEAR\",\n"
+    "          \"timePeriod\": {\n"
     "            \"delay\": 0,\n"
     "            \"duration\": 10.0\n"
     "          },\n"
     "            \"delay\": 0,\n"
     "            \"duration\": 10.0\n"
     "          },\n"
@@ -1406,17 +1406,17 @@ int UtcDaliBuilderPathConstraintsP(void)
     "      ]\n"
     "    }\n"
     "  },\n"
     "      ]\n"
     "    }\n"
     "  },\n"
-    "  \"shader-effects\": {\n"
+    "  \"shaderEffects\": {\n"
     "    \"Ripple2D\": {\n"
     "      \"program\": {\n"
     "        \"vertexPrefix\": \"\",\n"
     "        \"vertex\": \"void main(void)\\n{\\n  gl_Position = uProjection * uModelView * vec4(aPosition, 1.0);\\n  vTexCoord = aTexCoord;\\n}\\n\\n\",\n"
     "        \"fragmentPrefix\": \"\",\n"
     "        \"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\",\n"
     "    \"Ripple2D\": {\n"
     "      \"program\": {\n"
     "        \"vertexPrefix\": \"\",\n"
     "        \"vertex\": \"void main(void)\\n{\\n  gl_Position = uProjection * uModelView * vec4(aPosition, 1.0);\\n  vTexCoord = aTexCoord;\\n}\\n\\n\",\n"
     "        \"fragmentPrefix\": \"\",\n"
     "        \"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\",\n"
-    "        \"geometry-type\": \"GEOMETRY_TYPE_IMAGE\"\n"
+    "        \"geometryType\": \"GEOMETRY_TYPE_IMAGE\"\n"
     "      },\n"
     "      },\n"
-    "      \"geometry-hints\": \"HINT_NONE\",\n"
-    "      \"grid-density\": 0,\n"
+    "      \"geometryHints\": \"HINT_NONE\",\n"
+    "      \"gridDensity\": 0,\n"
     "      \"loop\": true,\n"
     "      \"uAmplitude\": 0.02,\n"
     "      \"uTime\": 0.0\n"
     "      \"loop\": true,\n"
     "      \"uAmplitude\": 0.02,\n"
     "      \"uTime\": 0.0\n"
index 887b6b9..9c3765d 100644 (file)
@@ -161,28 +161,28 @@ int UtcDaliConfirmationPopupDynamicSignalGenerationP(void)
   Actor footerActor = Actor::New();
 
   // The confirmation popup can use any control type for the ok or cancel buttons.
   Actor footerActor = Actor::New();
 
   // The confirmation popup can use any control type for the ok or cancel buttons.
-  // It requires that the name is "control-ok" to provide the "control-signal-ok" signal.
+  // It requires that the name is "controlOk" to provide the "controlSignalOk" signal.
   PushButton buttonOK = PushButton::New();
   PushButton buttonOK = PushButton::New();
-  buttonOK.SetName( "control-ok" );
+  buttonOK.SetName( "controlOk" );
   footerActor.Add( buttonOK );
 
   PushButton buttonCancel = PushButton::New();
   footerActor.Add( buttonOK );
 
   PushButton buttonCancel = PushButton::New();
-  buttonCancel.SetName( "control-cancel" );
+  buttonCancel.SetName( "controlCancel" );
   footerActor.Add( buttonCancel );
 
   popup.SetFooter( footerActor );
 
   footerActor.Add( buttonCancel );
 
   popup.SetFooter( footerActor );
 
-  // Tell the confirmation popup to connect to the signal in our button called "on-stage".
-  popup.SetProperty( Toolkit::ConfirmationPopup::Property::CONNECT_SIGNAL_OK_SELECTED, "on-stage" );
+  // Tell the confirmation popup to connect to the signal in our button called "onStage".
+  popup.SetProperty( Toolkit::ConfirmationPopup::Property::CONNECT_SIGNAL_OK_SELECTED, "onStage" );
   std::string resultProperty;
   DALI_TEST_CHECK( popup.GetProperty( Toolkit::ConfirmationPopup::Property::CONNECT_SIGNAL_OK_SELECTED ).Get( resultProperty ) );
   std::string resultProperty;
   DALI_TEST_CHECK( popup.GetProperty( Toolkit::ConfirmationPopup::Property::CONNECT_SIGNAL_OK_SELECTED ).Get( resultProperty ) );
-  DALI_TEST_EQUALS( resultProperty, "on-stage", TEST_LOCATION );
+  DALI_TEST_EQUALS( resultProperty, "onStage",  TEST_LOCATION );
 
   // Connect to the confirmation popup's OK signal. This signal is dynamically created upon connection.
   gSignalReceivedOK = false;
   gSignalReceivedCancel = false;
   TestConnectionTrackerObject* testTracker = new TestConnectionTrackerObject();
 
   // Connect to the confirmation popup's OK signal. This signal is dynamically created upon connection.
   gSignalReceivedOK = false;
   gSignalReceivedCancel = false;
   TestConnectionTrackerObject* testTracker = new TestConnectionTrackerObject();
-  popup.ConnectSignal( testTracker, "control-signal-ok", ConfirmationPopupOKTestFunctor() );
+  popup.ConnectSignal( testTracker, "controlSignalOk",   ConfirmationPopupOKTestFunctor() );
 
   // Check no signal has occurred yet.
   DALI_TEST_CHECK( !gSignalReceivedOK );
 
   // Check no signal has occurred yet.
   DALI_TEST_CHECK( !gSignalReceivedOK );
@@ -197,11 +197,11 @@ int UtcDaliConfirmationPopupDynamicSignalGenerationP(void)
 
   // Remove the popup from the stage, and connect the cancel signal.
   popup.Unparent();
 
   // Remove the popup from the stage, and connect the cancel signal.
   popup.Unparent();
-  popup.SetProperty( Toolkit::ConfirmationPopup::Property::CONNECT_SIGNAL_CANCEL_SELECTED, "on-stage" );
+  popup.SetProperty( Toolkit::ConfirmationPopup::Property::CONNECT_SIGNAL_CANCEL_SELECTED, "onStage" );
   DALI_TEST_CHECK( popup.GetProperty( Toolkit::ConfirmationPopup::Property::CONNECT_SIGNAL_CANCEL_SELECTED ).Get( resultProperty ) );
   DALI_TEST_CHECK( popup.GetProperty( Toolkit::ConfirmationPopup::Property::CONNECT_SIGNAL_CANCEL_SELECTED ).Get( resultProperty ) );
-  DALI_TEST_EQUALS( resultProperty, "on-stage", TEST_LOCATION );
+  DALI_TEST_EQUALS( resultProperty, "onStage",  TEST_LOCATION );
 
 
-  popup.ConnectSignal( testTracker, "control-signal-cancel", ConfirmationPopupCancelTestFunctor() );
+  popup.ConnectSignal( testTracker, "controlSignalCancel",   ConfirmationPopupCancelTestFunctor() );
 
   // Check the cancel signal has not occurred yet.
   DALI_TEST_CHECK( gSignalReceivedOK );
 
   // Check the cancel signal has not occurred yet.
   DALI_TEST_CHECK( gSignalReceivedOK );
@@ -233,18 +233,18 @@ int UtcDaliConfirmationPopupDynamicSignalGenerationN(void)
    Actor footerActor = Actor::New();
 
    PushButton buttonOK = PushButton::New();
    Actor footerActor = Actor::New();
 
    PushButton buttonOK = PushButton::New();
-   buttonOK.SetName( "control-ok-misnamed" );
+   buttonOK.SetName( "controlOkMisnamed" );
    popup.SetFooter( buttonOK );
 
    popup.SetFooter( buttonOK );
 
-   // Tell the confirmation popup to connect to the signal in our button called "on-stage".
-   popup.SetProperty( Toolkit::ConfirmationPopup::Property::CONNECT_SIGNAL_OK_SELECTED, "on-stage" );
+   // Tell the confirmation popup to connect to the signal in our button called "onStage".
+   popup.SetProperty( Toolkit::ConfirmationPopup::Property::CONNECT_SIGNAL_OK_SELECTED, "onStage" );
 
    // Connect to the confirmation popup's OK signal.
    gSignalReceivedOK = false;
 
 
    // Connect to the confirmation popup's OK signal.
    gSignalReceivedOK = false;
 
-   // The connection will fail at this point as no actor with the name "control-ok" will be located.
+   // The connection will fail at this point as no actor with the name "controlOk" will be located.
    TestConnectionTrackerObject* testTracker = new TestConnectionTrackerObject();
    TestConnectionTrackerObject* testTracker = new TestConnectionTrackerObject();
-   popup.ConnectSignal( testTracker, "control-signal-ok", ConfirmationPopupOKTestFunctor() );
+   popup.ConnectSignal( testTracker, "controlSignalOk",   ConfirmationPopupOKTestFunctor() );
 
    // Check no signal has occurred yet.
    DALI_TEST_CHECK( !gSignalReceivedOK );
 
    // Check no signal has occurred yet.
    DALI_TEST_CHECK( !gSignalReceivedOK );
index 4bfc808..93311ed 100644 (file)
@@ -385,17 +385,17 @@ int UtcDaliControlBackgroundColor(void)
 
   Property::Value propValue = control.GetProperty( Control::Property::BACKGROUND );
   Property::Map* resultMap = propValue.GetMap();
 
   Property::Value propValue = control.GetProperty( Control::Property::BACKGROUND );
   Property::Map* resultMap = propValue.GetMap();
-  DALI_TEST_CHECK( resultMap->Find( "renderer-type" ) );
-  DALI_TEST_CHECK( resultMap->Find( "renderer-type" )->Get<std::string>() == "color-renderer" );
-  DALI_TEST_CHECK( resultMap->Find( "blend-color" ) );
-  DALI_TEST_CHECK( resultMap->Find( "blend-color" )->Get<Vector4>() == Color::RED );
+  DALI_TEST_CHECK( resultMap->Find( "rendererType" ) );
+  DALI_TEST_CHECK( resultMap->Find( "rendererType" )->Get<std::string>() == "colorRenderer" );
+  DALI_TEST_CHECK( resultMap->Find( "blendColor" ) );
+  DALI_TEST_CHECK( resultMap->Find( "blendColor" )->Get<Vector4>() == Color::RED );
 
   control.SetBackgroundColor( Color::YELLOW );
 
   propValue = control.GetProperty( Control::Property::BACKGROUND );
   resultMap = propValue.GetMap();
 
   control.SetBackgroundColor( Color::YELLOW );
 
   propValue = control.GetProperty( Control::Property::BACKGROUND );
   resultMap = propValue.GetMap();
-  DALI_TEST_CHECK( resultMap->Find( "blend-color" ) );
-  DALI_TEST_CHECK( resultMap->Find( "blend-color" )->Get<Vector4>() == Color::YELLOW );
+  DALI_TEST_CHECK( resultMap->Find( "blendColor" ) );
+  DALI_TEST_CHECK( resultMap->Find( "blendColor" )->Get<Vector4>() == Color::YELLOW );
 
   END_TEST;
 }
 
   END_TEST;
 }
@@ -412,18 +412,18 @@ int UtcDaliControlBackgroundImage(void)
 
   Property::Value propValue = control.GetProperty( Control::Property::BACKGROUND );
   Property::Map* resultMap = propValue.GetMap();
 
   Property::Value propValue = control.GetProperty( Control::Property::BACKGROUND );
   Property::Map* resultMap = propValue.GetMap();
-  DALI_TEST_CHECK( resultMap->Find( "renderer-type" ) );
-  DALI_TEST_CHECK( resultMap->Find( "renderer-type" )->Get<std::string>() == "image-renderer" );
-  DALI_TEST_CHECK( resultMap->Find( "image-url" ) );
-  DALI_TEST_CHECK( resultMap->Find( "image-url" )->Get<std::string>() == "TestImage" );
+  DALI_TEST_CHECK( resultMap->Find( "rendererType" ) );
+  DALI_TEST_CHECK( resultMap->Find( "rendererType" )->Get<std::string>() == "imageRenderer" );
+  DALI_TEST_CHECK( resultMap->Find( "imageUrl" ) );
+  DALI_TEST_CHECK( resultMap->Find( "imageUrl" )->Get<std::string>() == "TestImage" );
 
   image = ResourceImage::New("TestImage2");
   control.SetBackgroundImage( image );
 
   propValue = control.GetProperty( Control::Property::BACKGROUND );
   resultMap = propValue.GetMap();
 
   image = ResourceImage::New("TestImage2");
   control.SetBackgroundImage( image );
 
   propValue = control.GetProperty( Control::Property::BACKGROUND );
   resultMap = propValue.GetMap();
-  DALI_TEST_CHECK( resultMap->Find( "image-url" ) );
-  DALI_TEST_CHECK( resultMap->Find( "image-url" )->Get<std::string>() == "TestImage2" );
+  DALI_TEST_CHECK( resultMap->Find( "imageUrl" ) );
+  DALI_TEST_CHECK( resultMap->Find( "imageUrl" )->Get<std::string>() == "TestImage2" );
 
   END_TEST;
 }
 
   END_TEST;
 }
@@ -441,31 +441,31 @@ int UtcDaliControlBackgroundProperties(void)
   control.SetProperty( Control::Property::BACKGROUND, colorMap );
   Property::Value propValue = control.GetProperty( Control::Property::BACKGROUND );
   Property::Map* resultMap = propValue.GetMap();
   control.SetProperty( Control::Property::BACKGROUND, colorMap );
   Property::Value propValue = control.GetProperty( Control::Property::BACKGROUND );
   Property::Map* resultMap = propValue.GetMap();
-  DALI_TEST_CHECK( resultMap->Find( "renderer-type" ) );
-  DALI_TEST_CHECK( resultMap->Find( "renderer-type" )->Get<std::string>() == "color-renderer" );
-  DALI_TEST_CHECK( resultMap->Find( "blend-color" ) );
-  DALI_TEST_CHECK( resultMap->Find( "blend-color" )->Get<Vector4>() == Color::RED );
+  DALI_TEST_CHECK( resultMap->Find( "rendererType" ) );
+  DALI_TEST_CHECK( resultMap->Find( "rendererType" )->Get<std::string>() == "colorRenderer" );
+  DALI_TEST_CHECK( resultMap->Find( "blendColor" ) );
+  DALI_TEST_CHECK( resultMap->Find( "blendColor" )->Get<Vector4>() == Color::RED );
 
   Property::Map imageMap;
   imageMap[ "filename" ] = "TestImage";
   control.SetProperty( Control::Property::BACKGROUND, imageMap );
   propValue = control.GetProperty( Control::Property::BACKGROUND );
   resultMap = propValue.GetMap();
 
   Property::Map imageMap;
   imageMap[ "filename" ] = "TestImage";
   control.SetProperty( Control::Property::BACKGROUND, imageMap );
   propValue = control.GetProperty( Control::Property::BACKGROUND );
   resultMap = propValue.GetMap();
-  DALI_TEST_CHECK( resultMap->Find( "renderer-type" ) );
-  DALI_TEST_CHECK( resultMap->Find( "renderer-type" )->Get<std::string>() == "image-renderer" );
-  DALI_TEST_CHECK( resultMap->Find( "image-url" ) );
-  DALI_TEST_CHECK( resultMap->Find( "image-url" )->Get<std::string>() == "TestImage" );
+  DALI_TEST_CHECK( resultMap->Find( "rendererType" ) );
+  DALI_TEST_CHECK( resultMap->Find( "rendererType" )->Get<std::string>() == "imageRenderer" );
+  DALI_TEST_CHECK( resultMap->Find( "imageUrl" ) );
+  DALI_TEST_CHECK( resultMap->Find( "imageUrl" )->Get<std::string>() == "TestImage" );
 
   Property::Map rendererMap;
 
   Property::Map rendererMap;
-  rendererMap["renderer-type"] = "color-renderer";
-  rendererMap["blend-color"] = Color::CYAN;
+  rendererMap["rendererType"] = "colorRenderer";
+  rendererMap["blendColor"] = Color::CYAN;
   control.SetProperty( Control::Property::BACKGROUND, rendererMap );
   propValue = control.GetProperty( Control::Property::BACKGROUND );
   resultMap = propValue.GetMap();
   control.SetProperty( Control::Property::BACKGROUND, rendererMap );
   propValue = control.GetProperty( Control::Property::BACKGROUND );
   resultMap = propValue.GetMap();
-  DALI_TEST_CHECK( resultMap->Find( "renderer-type" ) );
-  DALI_TEST_CHECK( resultMap->Find( "renderer-type" )->Get<std::string>() == "color-renderer" );
-  DALI_TEST_CHECK( resultMap->Find( "blend-color" ) );
-  DALI_TEST_CHECK( resultMap->Find( "blend-color" )->Get<Vector4>() == Color::CYAN );
+  DALI_TEST_CHECK( resultMap->Find( "rendererType" ) );
+  DALI_TEST_CHECK( resultMap->Find( "rendererType" )->Get<std::string>() == "colorRenderer" );
+  DALI_TEST_CHECK( resultMap->Find( "blendColor" ) );
+  DALI_TEST_CHECK( resultMap->Find( "blendColor" )->Get<Vector4>() == Color::CYAN );
 
   Property::Map emptyMap;
   control.SetProperty( Control::Property::BACKGROUND, emptyMap );
 
   Property::Map emptyMap;
   control.SetProperty( Control::Property::BACKGROUND, emptyMap );
@@ -515,7 +515,7 @@ int UtcDaliControlGestureSignals(void)
   DALI_TEST_CHECK( control.GetPinchGestureDetector() );
 
   DALI_TEST_CHECK( !control.GetLongPressGestureDetector() );
   DALI_TEST_CHECK( control.GetPinchGestureDetector() );
 
   DALI_TEST_CHECK( !control.GetLongPressGestureDetector() );
-  control.ConnectSignal( &connectionTracker, "long-pressed", &TestVoidCallback );
+  control.ConnectSignal( &connectionTracker, "longPressed",  &TestVoidCallback );
   DALI_TEST_CHECK( control.GetLongPressGestureDetector() );
 
   END_TEST;
   DALI_TEST_CHECK( control.GetLongPressGestureDetector() );
 
   END_TEST;
index a886d9d..7eb5f48 100644 (file)
@@ -916,7 +916,7 @@ int UtcDaliControlImplOnAccessibilityActivatedP(void)
   DALI_TEST_CHECK( handle );
 
   Property::Map attributes;
   DALI_TEST_CHECK( handle );
 
   Property::Map attributes;
-  DALI_TEST_EQUALS( false, handle.DoAction("accessibility-activated", attributes), TEST_LOCATION );
+  DALI_TEST_EQUALS( false, handle.DoAction("accessibilityActivated",  attributes), TEST_LOCATION );
 
   END_TEST;
 }
 
   END_TEST;
 }
index 84df350..a74af90 100644 (file)
@@ -48,8 +48,8 @@ int UtcDaliControlRendererCopyAndAssignment(void)
 
   RendererFactory factory = RendererFactory::Get();
   Property::Map propertyMap;
 
   RendererFactory factory = RendererFactory::Get();
   Property::Map propertyMap;
-  propertyMap.Insert("renderer-type", "color-renderer");
-  propertyMap.Insert("blend-color", Color::BLUE);
+  propertyMap.Insert("rendererType",  "colorRenderer");
+  propertyMap.Insert("blendColor",  Color::BLUE);
   ControlRenderer controlRenderer = factory.GetControlRenderer( propertyMap );
 
   ControlRenderer controlRendererCopy( controlRenderer );
   ControlRenderer controlRenderer = factory.GetControlRenderer( propertyMap );
 
   ControlRenderer controlRendererCopy( controlRenderer );
@@ -81,8 +81,8 @@ int UtcDaliControlRendererSetGetDepthIndex(void)
 
   RendererFactory factory = RendererFactory::Get();
   Property::Map propertyMap;
 
   RendererFactory factory = RendererFactory::Get();
   Property::Map propertyMap;
-  propertyMap.Insert("renderer-type", "color-renderer");
-  propertyMap.Insert("blend-color", Color::BLUE);
+  propertyMap.Insert("rendererType",  "colorRenderer");
+  propertyMap.Insert("blendColor",  Color::BLUE);
   ControlRenderer controlRenderer = factory.GetControlRenderer( propertyMap );
 
   controlRenderer.SetDepthIndex( 1.f );
   ControlRenderer controlRenderer = factory.GetControlRenderer( propertyMap );
 
   controlRenderer.SetDepthIndex( 1.f );
@@ -147,16 +147,16 @@ int UtcDaliControlRendererSize(void)
 
   // gradient renderer
   Property::Map propertyMap;
 
   // gradient renderer
   Property::Map propertyMap;
-  propertyMap.Insert("renderer-type", "gradient-renderer");
+  propertyMap.Insert("rendererType",  "gradientRenderer");
   Vector2 start(-1.f, -1.f);
   Vector2 end(1.f, 1.f);
   Vector2 start(-1.f, -1.f);
   Vector2 end(1.f, 1.f);
-  propertyMap.Insert("gradient-start-position", start);
-  propertyMap.Insert("gradient-end-position", end);
-  propertyMap.Insert("gradient-stop-offset", Vector2(0.f, 1.f));
+  propertyMap.Insert("gradientStartPosition",   start);
+  propertyMap.Insert("gradientEndPosition",   end);
+  propertyMap.Insert("gradientStopOffset",   Vector2(0.f, 1.f));
   Property::Array stopColors;
   stopColors.PushBack( Color::RED );
   stopColors.PushBack( Color::GREEN );
   Property::Array stopColors;
   stopColors.PushBack( Color::RED );
   stopColors.PushBack( Color::GREEN );
-  propertyMap.Insert("gradient-stop-color", stopColors);
+  propertyMap.Insert("gradientStopColor",   stopColors);
   ControlRenderer gradientRenderer = factory.GetControlRenderer(propertyMap);
   gradientRenderer.SetSize( rendererSize );
   DALI_TEST_EQUALS( gradientRenderer.GetSize(), rendererSize, TEST_LOCATION );
   ControlRenderer gradientRenderer = factory.GetControlRenderer(propertyMap);
   gradientRenderer.SetSize( rendererSize );
   DALI_TEST_EQUALS( gradientRenderer.GetSize(), rendererSize, TEST_LOCATION );
@@ -173,8 +173,8 @@ int UtcDaliControlRendererSetOnOffStage(void)
 
   RendererFactory factory = RendererFactory::Get();
   Property::Map propertyMap;
 
   RendererFactory factory = RendererFactory::Get();
   Property::Map propertyMap;
-  propertyMap.Insert("renderer-type", "color-renderer");
-  propertyMap.Insert("blend-color", Color::BLUE);
+  propertyMap.Insert("rendererType",  "colorRenderer");
+  propertyMap.Insert("blendColor",  Color::BLUE);
   ControlRenderer controlRenderer = factory.GetControlRenderer( propertyMap );
 
   Actor actor = Actor::New();
   ControlRenderer controlRenderer = factory.GetControlRenderer( propertyMap );
 
   Actor actor = Actor::New();
@@ -246,18 +246,18 @@ int UtcDaliControlRendererGetPropertyMap1(void)
 
   RendererFactory factory = RendererFactory::Get();
   Property::Map propertyMap;
 
   RendererFactory factory = RendererFactory::Get();
   Property::Map propertyMap;
-  propertyMap.Insert("renderer-type", "color-renderer");
-  propertyMap.Insert("blend-color", Color::BLUE);
+  propertyMap.Insert("rendererType",  "colorRenderer");
+  propertyMap.Insert("blendColor",  Color::BLUE);
   ControlRenderer colorRenderer = factory.GetControlRenderer( propertyMap );
 
   Property::Map resultMap;
   colorRenderer.CreatePropertyMap( resultMap );
 
   ControlRenderer colorRenderer = factory.GetControlRenderer( propertyMap );
 
   Property::Map resultMap;
   colorRenderer.CreatePropertyMap( resultMap );
 
-  Property::Value* typeValue = resultMap.Find( "renderer-type", Property::STRING );
+  Property::Value* typeValue = resultMap.Find( "rendererType",  Property::STRING );
   DALI_TEST_CHECK( typeValue );
   DALI_TEST_CHECK( typeValue );
-  DALI_TEST_CHECK( typeValue->Get<std::string>() == "color-renderer" );
+  DALI_TEST_CHECK( typeValue->Get<std::string>() == "colorRenderer" );
 
 
-  Property::Value* colorValue = resultMap.Find( "blend-color", Property::VECTOR4 );
+  Property::Value* colorValue = resultMap.Find( "blendColor",  Property::VECTOR4 );
   DALI_TEST_CHECK( colorValue );
   DALI_TEST_CHECK( colorValue->Get<Vector4>() == Color::BLUE );
 
   DALI_TEST_CHECK( colorValue );
   DALI_TEST_CHECK( colorValue->Get<Vector4>() == Color::BLUE );
 
@@ -266,7 +266,7 @@ int UtcDaliControlRendererGetPropertyMap1(void)
   factory.ResetRenderer( colorRenderer, actor, Color::CYAN );
   colorRenderer.CreatePropertyMap( resultMap );
 
   factory.ResetRenderer( colorRenderer, actor, Color::CYAN );
   colorRenderer.CreatePropertyMap( resultMap );
 
-  colorValue = resultMap.Find( "blend-color", Property::VECTOR4 );
+  colorValue = resultMap.Find( "blendColor",  Property::VECTOR4 );
   DALI_TEST_CHECK( colorValue );
   DALI_TEST_CHECK( colorValue->Get<Vector4>() == Color::CYAN );
 
   DALI_TEST_CHECK( colorValue );
   DALI_TEST_CHECK( colorValue->Get<Vector4>() == Color::CYAN );
 
@@ -280,39 +280,39 @@ int UtcDaliControlRendererGetPropertyMap2(void)
 
   RendererFactory factory = RendererFactory::Get();
   Property::Map propertyMap;
 
   RendererFactory factory = RendererFactory::Get();
   Property::Map propertyMap;
-  propertyMap.Insert("renderer-type", "border-renderer");
-  propertyMap.Insert("border-color", Color::BLUE);
-  propertyMap.Insert("border-size", 5.f);
+  propertyMap.Insert("rendererType",  "borderRenderer");
+  propertyMap.Insert("borderColor",  Color::BLUE);
+  propertyMap.Insert("borderSize",  5.f);
   ControlRenderer borderRenderer = factory.GetControlRenderer( propertyMap );
 
   Property::Map resultMap;
   borderRenderer.CreatePropertyMap( resultMap );
 
   // check the property values from the returned map from control renderer
   ControlRenderer borderRenderer = factory.GetControlRenderer( propertyMap );
 
   Property::Map resultMap;
   borderRenderer.CreatePropertyMap( resultMap );
 
   // check the property values from the returned map from control renderer
-  Property::Value* typeValue = resultMap.Find( "renderer-type", Property::STRING );
+  Property::Value* typeValue = resultMap.Find( "rendererType",  Property::STRING );
   DALI_TEST_CHECK( typeValue );
   DALI_TEST_CHECK( typeValue );
-  DALI_TEST_CHECK( typeValue->Get<std::string>() == "border-renderer" );
+  DALI_TEST_CHECK( typeValue->Get<std::string>() == "borderRenderer" );
 
 
-  Property::Value* colorValue = resultMap.Find( "border-color", Property::VECTOR4 );
+  Property::Value* colorValue = resultMap.Find( "borderColor",  Property::VECTOR4 );
   DALI_TEST_CHECK( colorValue );
   DALI_TEST_CHECK( colorValue->Get<Vector4>() == Color::BLUE );
 
   DALI_TEST_CHECK( colorValue );
   DALI_TEST_CHECK( colorValue->Get<Vector4>() == Color::BLUE );
 
-  Property::Value* sizeValue = resultMap.Find( "border-size", Property::FLOAT );
+  Property::Value* sizeValue = resultMap.Find( "borderSize",  Property::FLOAT );
   DALI_TEST_CHECK( sizeValue );
   DALI_TEST_CHECK( sizeValue->Get<float>() == 5.f );
 
   borderRenderer = factory.GetControlRenderer( 10.f, Color::CYAN );
   borderRenderer.CreatePropertyMap( resultMap );
 
   DALI_TEST_CHECK( sizeValue );
   DALI_TEST_CHECK( sizeValue->Get<float>() == 5.f );
 
   borderRenderer = factory.GetControlRenderer( 10.f, Color::CYAN );
   borderRenderer.CreatePropertyMap( resultMap );
 
-  typeValue = resultMap.Find( "renderer-type", Property::STRING );
+  typeValue = resultMap.Find( "rendererType",  Property::STRING );
   DALI_TEST_CHECK( typeValue );
   DALI_TEST_CHECK( typeValue );
-  DALI_TEST_CHECK( typeValue->Get<std::string>() == "border-renderer" );
+  DALI_TEST_CHECK( typeValue->Get<std::string>() == "borderRenderer" );
 
 
-   colorValue = resultMap.Find( "border-color", Property::VECTOR4 );
+   colorValue = resultMap.Find( "borderColor",  Property::VECTOR4 );
   DALI_TEST_CHECK( colorValue );
   DALI_TEST_CHECK( colorValue->Get<Vector4>() == Color::CYAN );
 
   DALI_TEST_CHECK( colorValue );
   DALI_TEST_CHECK( colorValue->Get<Vector4>() == Color::CYAN );
 
-  colorValue = resultMap.Find( "border-size", Property::FLOAT );
+  colorValue = resultMap.Find( "borderSize",  Property::FLOAT );
   DALI_TEST_CHECK( colorValue );
   DALI_TEST_CHECK( colorValue->Get<float>() == 10.f );
 
   DALI_TEST_CHECK( colorValue );
   DALI_TEST_CHECK( colorValue->Get<float>() == 10.f );
 
@@ -328,20 +328,20 @@ int UtcDaliControlRendererGetPropertyMap3(void)
   DALI_TEST_CHECK( factory );
 
   Property::Map propertyMap;
   DALI_TEST_CHECK( factory );
 
   Property::Map propertyMap;
-  propertyMap.Insert("renderer-type", "gradient-renderer");
+  propertyMap.Insert("rendererType",  "gradientRenderer");
 
   Vector2 start(-1.f, -1.f);
   Vector2 end(1.f, 1.f);
 
   Vector2 start(-1.f, -1.f);
   Vector2 end(1.f, 1.f);
-  propertyMap.Insert("gradient-start-position", start);
-  propertyMap.Insert("gradient-end-position", end);
-  propertyMap.Insert("gradient-spread-method", "repeat");
+  propertyMap.Insert("gradientStartPosition",   start);
+  propertyMap.Insert("gradientEndPosition",   end);
+  propertyMap.Insert("gradientSpreadMethod",   "repeat");
 
 
-  propertyMap.Insert("gradient-stop-offset", Vector2(0.2f, 0.8f));
+  propertyMap.Insert("gradientStopOffset",   Vector2(0.2f, 0.8f));
 
   Property::Array stopColors;
   stopColors.PushBack( Color::RED );
   stopColors.PushBack( Color::GREEN );
 
   Property::Array stopColors;
   stopColors.PushBack( Color::RED );
   stopColors.PushBack( Color::GREEN );
-  propertyMap.Insert("gradient-stop-color", stopColors);
+  propertyMap.Insert("gradientStopColor",   stopColors);
 
   ControlRenderer gradientRenderer = factory.GetControlRenderer(propertyMap);
 
 
   ControlRenderer gradientRenderer = factory.GetControlRenderer(propertyMap);
 
@@ -349,34 +349,34 @@ int UtcDaliControlRendererGetPropertyMap3(void)
   gradientRenderer.CreatePropertyMap( resultMap );
 
   // check the property values from the returned map from control renderer
   gradientRenderer.CreatePropertyMap( resultMap );
 
   // check the property values from the returned map from control renderer
-  Property::Value* value = resultMap.Find( "renderer-type", Property::STRING );
+  Property::Value* value = resultMap.Find( "rendererType",  Property::STRING );
   DALI_TEST_CHECK( value );
   DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<std::string>() == "gradient-renderer" );
+  DALI_TEST_CHECK( value->Get<std::string>() == "gradientRenderer" );
 
 
-  value = resultMap.Find( "gradient-units", Property::STRING );
+  value = resultMap.Find( "gradientUnits",  Property::STRING );
   DALI_TEST_CHECK( value );
   DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<std::string>() == "object-bounding-box" );
+  DALI_TEST_CHECK( value->Get<std::string>() == "objectBoundingBox" );
 
 
-  value = resultMap.Find( "gradient-spread-method", Property::STRING );
+  value = resultMap.Find( "gradientSpreadMethod",   Property::STRING );
   DALI_TEST_CHECK( value );
   DALI_TEST_CHECK( value->Get<std::string>() == "repeat" );
 
   DALI_TEST_CHECK( value );
   DALI_TEST_CHECK( value->Get<std::string>() == "repeat" );
 
-  value = resultMap.Find( "gradient-start-position", Property::VECTOR2 );
+  value = resultMap.Find( "gradientStartPosition",   Property::VECTOR2 );
   DALI_TEST_CHECK( value );
   DALI_TEST_EQUALS( value->Get<Vector2>(), start , Math::MACHINE_EPSILON_100, TEST_LOCATION );
 
   DALI_TEST_CHECK( value );
   DALI_TEST_EQUALS( value->Get<Vector2>(), start , Math::MACHINE_EPSILON_100, TEST_LOCATION );
 
-  value = resultMap.Find( "gradient-end-position", Property::VECTOR2 );
+  value = resultMap.Find( "gradientEndPosition",   Property::VECTOR2 );
   DALI_TEST_CHECK( value );
   DALI_TEST_EQUALS( value->Get<Vector2>(), end , Math::MACHINE_EPSILON_100, TEST_LOCATION );
 
   DALI_TEST_CHECK( value );
   DALI_TEST_EQUALS( value->Get<Vector2>(), end , Math::MACHINE_EPSILON_100, TEST_LOCATION );
 
-  value = resultMap.Find( "gradient-stop-offset", Property::ARRAY );
+  value = resultMap.Find( "gradientStopOffset",   Property::ARRAY );
   DALI_TEST_CHECK( value );
   Property::Array* offsetArray = value->GetArray();
   DALI_TEST_CHECK( offsetArray->Count() == 2 );
   DALI_TEST_EQUALS( offsetArray->GetElementAt(0).Get<float>(), 0.2f , Math::MACHINE_EPSILON_100, TEST_LOCATION );
   DALI_TEST_EQUALS( offsetArray->GetElementAt(1).Get<float>(), 0.8f , Math::MACHINE_EPSILON_100, TEST_LOCATION );
 
   DALI_TEST_CHECK( value );
   Property::Array* offsetArray = value->GetArray();
   DALI_TEST_CHECK( offsetArray->Count() == 2 );
   DALI_TEST_EQUALS( offsetArray->GetElementAt(0).Get<float>(), 0.2f , Math::MACHINE_EPSILON_100, TEST_LOCATION );
   DALI_TEST_EQUALS( offsetArray->GetElementAt(1).Get<float>(), 0.8f , Math::MACHINE_EPSILON_100, TEST_LOCATION );
 
-  value = resultMap.Find( "gradient-stop-color", Property::ARRAY );
+  value = resultMap.Find( "gradientStopColor",   Property::ARRAY );
   DALI_TEST_CHECK( value );
   Property::Array* colorArray = value->GetArray();
   DALI_TEST_CHECK( colorArray->Count() == 2 );
   DALI_TEST_CHECK( value );
   Property::Array* colorArray = value->GetArray();
   DALI_TEST_CHECK( colorArray->Count() == 2 );
@@ -395,20 +395,20 @@ int UtcDaliControlRendererGetPropertyMap4(void)
   DALI_TEST_CHECK( factory );
 
   Property::Map propertyMap;
   DALI_TEST_CHECK( factory );
 
   Property::Map propertyMap;
-  propertyMap.Insert("renderer-type", "gradient-renderer");
+  propertyMap.Insert("rendererType",  "gradientRenderer");
 
   Vector2 center(100.f, 100.f);
   float radius = 100.f;
 
   Vector2 center(100.f, 100.f);
   float radius = 100.f;
-  propertyMap.Insert("gradient-units", "user-space");
-  propertyMap.Insert("gradient-center", center);
-  propertyMap.Insert("gradient-radius", radius);
-  propertyMap.Insert("gradient-stop-offset", Vector3(0.1f, 0.3f, 1.1f));
+  propertyMap.Insert("gradientUnits",  "userSpace");
+  propertyMap.Insert("gradientCenter",  center);
+  propertyMap.Insert("gradientRadius",  radius);
+  propertyMap.Insert("gradientStopOffset",   Vector3(0.1f, 0.3f, 1.1f));
 
   Property::Array stopColors;
   stopColors.PushBack( Color::RED );
   stopColors.PushBack( Color::BLACK );
   stopColors.PushBack( Color::GREEN );
 
   Property::Array stopColors;
   stopColors.PushBack( Color::RED );
   stopColors.PushBack( Color::BLACK );
   stopColors.PushBack( Color::GREEN );
-  propertyMap.Insert("gradient-stop-color", stopColors);
+  propertyMap.Insert("gradientStopColor",   stopColors);
 
   ControlRenderer gradientRenderer = factory.GetControlRenderer(propertyMap);
   DALI_TEST_CHECK( gradientRenderer );
 
   ControlRenderer gradientRenderer = factory.GetControlRenderer(propertyMap);
   DALI_TEST_CHECK( gradientRenderer );
@@ -417,27 +417,27 @@ int UtcDaliControlRendererGetPropertyMap4(void)
   gradientRenderer.CreatePropertyMap( resultMap );
 
   // check the property values from the returned map from control renderer
   gradientRenderer.CreatePropertyMap( resultMap );
 
   // check the property values from the returned map from control renderer
-  Property::Value* value = resultMap.Find( "renderer-type", Property::STRING );
+  Property::Value* value = resultMap.Find( "rendererType",  Property::STRING );
   DALI_TEST_CHECK( value );
   DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<std::string>() == "gradient-renderer" );
+  DALI_TEST_CHECK( value->Get<std::string>() == "gradientRenderer" );
 
 
-  value = resultMap.Find( "gradient-units", Property::STRING );
+  value = resultMap.Find( "gradientUnits",  Property::STRING );
   DALI_TEST_CHECK( value );
   DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<std::string>() == "user-space" );
+  DALI_TEST_CHECK( value->Get<std::string>() == "userSpace" );
 
 
-  value = resultMap.Find( "gradient-spread-method", Property::STRING );
+  value = resultMap.Find( "gradientSpreadMethod",   Property::STRING );
   DALI_TEST_CHECK( value );
   DALI_TEST_CHECK( value->Get<std::string>() == "pad" );
 
   DALI_TEST_CHECK( value );
   DALI_TEST_CHECK( value->Get<std::string>() == "pad" );
 
-  value = resultMap.Find( "gradient-center", Property::VECTOR2 );
+  value = resultMap.Find( "gradientCenter",  Property::VECTOR2 );
   DALI_TEST_CHECK( value );
   DALI_TEST_EQUALS( value->Get<Vector2>(), center , Math::MACHINE_EPSILON_100, TEST_LOCATION );
 
   DALI_TEST_CHECK( value );
   DALI_TEST_EQUALS( value->Get<Vector2>(), center , Math::MACHINE_EPSILON_100, TEST_LOCATION );
 
-  value = resultMap.Find( "gradient-radius", Property::FLOAT );
+  value = resultMap.Find( "gradientRadius",  Property::FLOAT );
   DALI_TEST_CHECK( value );
   DALI_TEST_EQUALS( value->Get<float>(), radius , Math::MACHINE_EPSILON_100, TEST_LOCATION );
 
   DALI_TEST_CHECK( value );
   DALI_TEST_EQUALS( value->Get<float>(), radius , Math::MACHINE_EPSILON_100, TEST_LOCATION );
 
-  value = resultMap.Find( "gradient-stop-offset", Property::ARRAY );
+  value = resultMap.Find( "gradientStopOffset",   Property::ARRAY );
   DALI_TEST_CHECK( value );
   Property::Array* offsetArray = value->GetArray();
   DALI_TEST_CHECK( offsetArray->Count() == 3 );
   DALI_TEST_CHECK( value );
   Property::Array* offsetArray = value->GetArray();
   DALI_TEST_CHECK( offsetArray->Count() == 3 );
@@ -446,7 +446,7 @@ int UtcDaliControlRendererGetPropertyMap4(void)
   // any stop value will be clamped to [0.0, 1.0];
   DALI_TEST_EQUALS( offsetArray->GetElementAt(2).Get<float>(), 1.0f , Math::MACHINE_EPSILON_100, TEST_LOCATION );
 
   // any stop value will be clamped to [0.0, 1.0];
   DALI_TEST_EQUALS( offsetArray->GetElementAt(2).Get<float>(), 1.0f , Math::MACHINE_EPSILON_100, TEST_LOCATION );
 
-  value = resultMap.Find( "gradient-stop-color", Property::ARRAY );
+  value = resultMap.Find( "gradientStopColor",   Property::ARRAY );
   DALI_TEST_CHECK( value );
   Property::Array* colorArray = value->GetArray();
   DALI_TEST_CHECK( colorArray->Count() == 3 );
   DALI_TEST_CHECK( value );
   Property::Array* colorArray = value->GetArray();
   DALI_TEST_CHECK( colorArray->Count() == 3 );
@@ -464,12 +464,12 @@ int UtcDaliControlRendererGetPropertyMap5(void)
 
   RendererFactory factory = RendererFactory::Get();
   Property::Map propertyMap;
 
   RendererFactory factory = RendererFactory::Get();
   Property::Map propertyMap;
-  propertyMap.Insert( "renderer-type", "image-renderer" );
-  propertyMap.Insert( "image-url", TEST_IMAGE_FILE_NAME );
-  propertyMap.Insert( "image-desired-width", 20 );
-  propertyMap.Insert( "image-desired-height", 30 );
-  propertyMap.Insert( "image-fitting-mode", "fit-height" );
-  propertyMap.Insert( "image-sampling-mode", "box-then-nearest" );
+  propertyMap.Insert( "rendererType",  "imageRenderer" );
+  propertyMap.Insert( "imageUrl",  TEST_IMAGE_FILE_NAME );
+  propertyMap.Insert( "imageDesiredWidth",   20 );
+  propertyMap.Insert( "imageDesiredHeight",   30 );
+  propertyMap.Insert( "imageFittingMode",   "fitHeight" );
+  propertyMap.Insert( "imageSamplingMode",   "boxThenNearest" );
 
   ControlRenderer imageRenderer = factory.GetControlRenderer(propertyMap);
   DALI_TEST_CHECK( imageRenderer );
 
   ControlRenderer imageRenderer = factory.GetControlRenderer(propertyMap);
   DALI_TEST_CHECK( imageRenderer );
@@ -478,27 +478,27 @@ int UtcDaliControlRendererGetPropertyMap5(void)
   imageRenderer.CreatePropertyMap( resultMap );
 
   // check the property values from the returned map from control renderer
   imageRenderer.CreatePropertyMap( resultMap );
 
   // check the property values from the returned map from control renderer
-  Property::Value* value = resultMap.Find( "renderer-type", Property::STRING );
+  Property::Value* value = resultMap.Find( "rendererType",  Property::STRING );
   DALI_TEST_CHECK( value );
   DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<std::string>() == "image-renderer" );
+  DALI_TEST_CHECK( value->Get<std::string>() == "imageRenderer" );
 
 
-  value = resultMap.Find( "image-url", Property::STRING );
+  value = resultMap.Find( "imageUrl",  Property::STRING );
   DALI_TEST_CHECK( value );
   DALI_TEST_CHECK( value->Get<std::string>() == TEST_IMAGE_FILE_NAME );
 
   DALI_TEST_CHECK( value );
   DALI_TEST_CHECK( value->Get<std::string>() == TEST_IMAGE_FILE_NAME );
 
-  value = resultMap.Find( "image-fitting-mode", Property::STRING );
+  value = resultMap.Find( "imageFittingMode",   Property::STRING );
   DALI_TEST_CHECK( value );
   DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<std::string>() == "fit-height" );
+  DALI_TEST_CHECK( value->Get<std::string>() == "fitHeight" );
 
 
-  value = resultMap.Find( "image-sampling-mode", Property::STRING );
+  value = resultMap.Find( "imageSamplingMode",   Property::STRING );
   DALI_TEST_CHECK( value );
   DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<std::string>() == "box-then-nearest" );
+  DALI_TEST_CHECK( value->Get<std::string>() == "boxThenNearest" );
 
 
-  value = resultMap.Find( "image-desired-width", Property::INTEGER );
+  value = resultMap.Find( "imageDesiredWidth",   Property::INTEGER );
   DALI_TEST_CHECK( value );
   DALI_TEST_CHECK( value->Get<int>() == 20 );
 
   DALI_TEST_CHECK( value );
   DALI_TEST_CHECK( value->Get<int>() == 20 );
 
-  value = resultMap.Find( "image-desired-height", Property::INTEGER );
+  value = resultMap.Find( "imageDesiredHeight",   Property::INTEGER );
   DALI_TEST_CHECK( value );
   DALI_TEST_CHECK( value->Get<int>() == 30 );
 
   DALI_TEST_CHECK( value );
   DALI_TEST_CHECK( value->Get<int>() == 30 );
 
@@ -507,27 +507,27 @@ int UtcDaliControlRendererGetPropertyMap5(void)
   imageRenderer = factory.GetControlRenderer(image);
   imageRenderer.CreatePropertyMap( resultMap );
 
   imageRenderer = factory.GetControlRenderer(image);
   imageRenderer.CreatePropertyMap( resultMap );
 
-  value = resultMap.Find( "renderer-type", Property::STRING );
+  value = resultMap.Find( "rendererType",  Property::STRING );
   DALI_TEST_CHECK( value );
   DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<std::string>() == "image-renderer" );
+  DALI_TEST_CHECK( value->Get<std::string>() == "imageRenderer" );
 
 
-  value = resultMap.Find( "image-url", Property::STRING );
+  value = resultMap.Find( "imageUrl",  Property::STRING );
   DALI_TEST_CHECK( value );
   DALI_TEST_CHECK( value->Get<std::string>() == TEST_IMAGE_FILE_NAME );
 
   DALI_TEST_CHECK( value );
   DALI_TEST_CHECK( value->Get<std::string>() == TEST_IMAGE_FILE_NAME );
 
-  value = resultMap.Find( "image-fitting-mode", Property::STRING );
+  value = resultMap.Find( "imageFittingMode",   Property::STRING );
   DALI_TEST_CHECK( value );
   DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<std::string>() == "shrink-to-fit" );
+  DALI_TEST_CHECK( value->Get<std::string>() == "shrinkToFit" );
 
 
-  value = resultMap.Find( "image-sampling-mode", Property::STRING );
+  value = resultMap.Find( "imageSamplingMode",   Property::STRING );
   DALI_TEST_CHECK( value );
   DALI_TEST_CHECK( value->Get<std::string>() == "box" );
 
   DALI_TEST_CHECK( value );
   DALI_TEST_CHECK( value->Get<std::string>() == "box" );
 
-  value = resultMap.Find( "image-desired-width", Property::INTEGER );
+  value = resultMap.Find( "imageDesiredWidth",   Property::INTEGER );
   DALI_TEST_CHECK( value );
   DALI_TEST_CHECK( value->Get<int>() == 100 );
 
   DALI_TEST_CHECK( value );
   DALI_TEST_CHECK( value->Get<int>() == 100 );
 
-  value = resultMap.Find( "image-desired-height", Property::INTEGER );
+  value = resultMap.Find( "imageDesiredHeight",   Property::INTEGER );
   DALI_TEST_CHECK( value );
   DALI_TEST_CHECK( value->Get<int>() == 200 );
 
   DALI_TEST_CHECK( value );
   DALI_TEST_CHECK( value->Get<int>() == 200 );
 
@@ -541,24 +541,24 @@ int UtcDaliControlRendererGetPropertyMap6(void)
 
   RendererFactory factory = RendererFactory::Get();
   Property::Map propertyMap;
 
   RendererFactory factory = RendererFactory::Get();
   Property::Map propertyMap;
-  propertyMap.Insert( "renderer-type", "n-patch-renderer" );
-  propertyMap.Insert( "image-url", TEST_NPATCH_FILE_NAME );
-  propertyMap.Insert( "border-only", true );
+  propertyMap.Insert( "rendererType",  "nPatchRenderer" );
+  propertyMap.Insert( "imageUrl",  TEST_NPATCH_FILE_NAME );
+  propertyMap.Insert( "borderOnly",  true );
   ControlRenderer nPatchRenderer = factory.GetControlRenderer( propertyMap );
 
   Property::Map resultMap;
   nPatchRenderer.CreatePropertyMap( resultMap );
 
   // check the property values from the returned map from control renderer
   ControlRenderer nPatchRenderer = factory.GetControlRenderer( propertyMap );
 
   Property::Map resultMap;
   nPatchRenderer.CreatePropertyMap( resultMap );
 
   // check the property values from the returned map from control renderer
-  Property::Value* value = resultMap.Find( "renderer-type", Property::STRING );
+  Property::Value* value = resultMap.Find( "rendererType",  Property::STRING );
   DALI_TEST_CHECK( value );
   DALI_TEST_CHECK( value );
-  DALI_TEST_CHECK( value->Get<std::string>() == "n-patch-renderer" );
+  DALI_TEST_CHECK( value->Get<std::string>() == "nPatchRenderer" );
 
 
-  value = resultMap.Find( "image-url", Property::STRING );
+  value = resultMap.Find( "imageUrl",  Property::STRING );
   DALI_TEST_CHECK( value );
   DALI_TEST_CHECK( value->Get<std::string>() == TEST_NPATCH_FILE_NAME );
 
   DALI_TEST_CHECK( value );
   DALI_TEST_CHECK( value->Get<std::string>() == TEST_NPATCH_FILE_NAME );
 
-  value = resultMap.Find( "border-only", Property::BOOLEAN );
+  value = resultMap.Find( "borderOnly",  Property::BOOLEAN );
   DALI_TEST_CHECK( value );
   DALI_TEST_CHECK( value->Get<bool>() );
 
   DALI_TEST_CHECK( value );
   DALI_TEST_CHECK( value->Get<bool>() );
 
index f42e16c..1f2c667 100644 (file)
@@ -332,8 +332,8 @@ int UtcDaliJsonParserMethod04(void)
           'actor':'bump-image',                                         \
           'property':'uLightPosition',                                  \
           'value':[0.8, 0.0, -1.5],                                     \
           'actor':'bump-image',                                         \
           'property':'uLightPosition',                                  \
           'value':[0.8, 0.0, -1.5],                                     \
-          'alpha-function': 'BOUNCE',                                   \
-          'time-period': { 'duration': 2.5 }                            \
+          'alphaFunction': 'BOUNCE',                                    \
+          'timePeriod': { 'duration': 2.5 }                            \
         }                                                               \
       ]                                                                 \
     }                                                                   \
         }                                                               \
       ]                                                                 \
     }                                                                   \
@@ -349,7 +349,7 @@ int UtcDaliJsonParserMethod04(void)
     {                                                                   \
       'duration': 5.0,                                                  \
       'loop': true,                                                     \
     {                                                                   \
       'duration': 5.0,                                                  \
       'loop': true,                                                     \
-      'end-action':'DISCARD'                                            \
+      'endAction':'DISCARD'                                            \
     }                                                                   \
   }                                                                     \
 }                                                                       \
     }                                                                   \
   }                                                                     \
 }                                                                       \
@@ -411,8 +411,8 @@ int UtcDaliJsonParserMethod05(void)
           'actor':'bump-image',                                         \
           'property':'uLightPosition',                                  \
           'value':[0.8, 0.0, -1.5],                                     \
           'actor':'bump-image',                                         \
           'property':'uLightPosition',                                  \
           'value':[0.8, 0.0, -1.5],                                     \
-          'alpha-function': 'BOUNCE',                                   \
-          'time-period': { 'duration': 2.5 }                            \
+          'alphaFunction': 'BOUNCE',                                    \
+          'timePeriod': { 'duration': 2.5 }                            \
         }                                                               \
       ]                                                                 \
     }                                                                   \
         }                                                               \
       ]                                                                 \
     }                                                                   \
@@ -699,8 +699,8 @@ int UtcDaliJsonParserMethod11(void)
           'actor':'bump-image',                                         \
           'property':'uLightPosition',                                  \
           'value':[0.8, 0.0, -1.5],                                     \
           'actor':'bump-image',                                         \
           'property':'uLightPosition',                                  \
           'value':[0.8, 0.0, -1.5],                                     \
-          'alpha-function': 'BOUNCE',                                   \
-          'time-period': { 'duration': 2.5 }                            \
+          'alphaFunction': 'BOUNCE',                                    \
+          'timePeriod': { 'duration': 2.5 }                            \
         }                                                               \
       ]                                                                 \
     }                                                                   \
         }                                                               \
       ]                                                                 \
     }                                                                   \
index f2a631c..42b7939 100644 (file)
@@ -416,8 +416,8 @@ int UtcDaliPageTurnViewSetGetProperty(void)
 
   Stage::GetCurrent().Add( landscapeView );
 
 
   Stage::GetCurrent().Add( landscapeView );
 
-  // Test "page-size" property
-  DALI_TEST_CHECK( landscapeView.GetPropertyIndex("page-size") == PageTurnView::Property::PAGE_SIZE  );
+  // Test "pageSize" property
+  DALI_TEST_CHECK( landscapeView.GetPropertyIndex("pageSize") == PageTurnView::Property::PAGE_SIZE  );
   DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::PAGE_SIZE).Get<Vector2>(), PAGE_SIZE, TEST_LOCATION );
 
   Vector2 newSize( PAGE_SIZE.x*0.75, PAGE_SIZE.y*0.5f );
   DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::PAGE_SIZE).Get<Vector2>(), PAGE_SIZE, TEST_LOCATION );
 
   Vector2 newSize( PAGE_SIZE.x*0.75, PAGE_SIZE.y*0.5f );
@@ -431,8 +431,8 @@ int UtcDaliPageTurnViewSetGetProperty(void)
   Wait( application);
   DALI_TEST_EQUALS( Vector2(landscapeView.GetTargetSize()), Vector2(newSize.x*3.f, newSize.y*1.5f), TEST_LOCATION);
 
   Wait( application);
   DALI_TEST_EQUALS( Vector2(landscapeView.GetTargetSize()), Vector2(newSize.x*3.f, newSize.y*1.5f), TEST_LOCATION);
 
-  // Test "current-page-id" property
-  DALI_TEST_CHECK( landscapeView.GetPropertyIndex("current-page-id") == PageTurnView::Property::CURRENT_PAGE_ID );
+  // Test "currentPageId" property
+  DALI_TEST_CHECK( landscapeView.GetPropertyIndex("currentPageId") == PageTurnView::Property::CURRENT_PAGE_ID );
   DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), 0, TEST_LOCATION );
 
   int pageId = static_cast<int>(TOTAL_PAGE_NUMBER)/3;
   DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), 0, TEST_LOCATION );
 
   int pageId = static_cast<int>(TOTAL_PAGE_NUMBER)/3;
@@ -442,8 +442,8 @@ int UtcDaliPageTurnViewSetGetProperty(void)
   landscapeView.SetProperty( PageTurnView::Property::CURRENT_PAGE_ID, pageId*2 );
   DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), pageId*2, TEST_LOCATION );
 
   landscapeView.SetProperty( PageTurnView::Property::CURRENT_PAGE_ID, pageId*2 );
   DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get<int>(), pageId*2, TEST_LOCATION );
 
-  // Test "spin-shadow" property
-  DALI_TEST_CHECK( landscapeView.GetPropertyIndex( "spine-shadow" ) == PageTurnView::Property::SPINE_SHADOW );
+  // Test "spinShadow" property
+  DALI_TEST_CHECK( landscapeView.GetPropertyIndex( "spineShadow" ) == PageTurnView::Property::SPINE_SHADOW );
   landscapeView.SetProperty( PageTurnView::Property::SPINE_SHADOW, SPINE_SHADOW_PARAMETER );
   DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::SPINE_SHADOW).Get<Vector2>(), SPINE_SHADOW_PARAMETER, TEST_LOCATION );
 
   landscapeView.SetProperty( PageTurnView::Property::SPINE_SHADOW, SPINE_SHADOW_PARAMETER );
   DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::SPINE_SHADOW).Get<Vector2>(), SPINE_SHADOW_PARAMETER, TEST_LOCATION );
 
index 3a8b722..f9fd513 100644 (file)
@@ -941,7 +941,7 @@ int UtcDaliPopupPropertyBacking(void)
   popup.SetProperty( Popup::Property::ANIMATION_DURATION, 0.0f );
   Stage::GetCurrent().Add( popup );
 
   popup.SetProperty( Popup::Property::ANIMATION_DURATION, 0.0f );
   Stage::GetCurrent().Add( popup );
 
-  Actor backing = popup.FindChildByName( "popup-backing" );
+  Actor backing = popup.FindChildByName( "popupBacking" );
   DALI_TEST_CHECK( backing );
 
   DALI_TEST_EQUALS( backing.GetCurrentOpacity(), 1.0f, Math::MACHINE_EPSILON_0, TEST_LOCATION );
   DALI_TEST_CHECK( backing );
 
   DALI_TEST_EQUALS( backing.GetCurrentOpacity(), 1.0f, Math::MACHINE_EPSILON_0, TEST_LOCATION );
@@ -1022,35 +1022,35 @@ int UtcDaliPopupPropertyCustomAnimation(void)
   popup.SetProperty( Popup::Property::ANIMATION_DURATION, 1.0f );
   popup.SetProperty( Popup::Property::ANIMATION_MODE, "CUSTOM" );
 
   popup.SetProperty( Popup::Property::ANIMATION_DURATION, 1.0f );
   popup.SetProperty( Popup::Property::ANIMATION_MODE, "CUSTOM" );
 
-  Actor popupContainer = popup.FindChildByName( "popup-container" );
+  Actor popupContainer = popup.FindChildByName( "popupContainer" );
   DALI_TEST_CHECK( popupContainer );
 
   Vector3 entryAnimationDestination( 300.0f, 200.0f, 0.0f );
   Vector3 exitAnimationDestination( -300.0f, -200.0f, 0.0f );
 
   Property::Map animationMapEntry;
   DALI_TEST_CHECK( popupContainer );
 
   Vector3 entryAnimationDestination( 300.0f, 200.0f, 0.0f );
   Vector3 exitAnimationDestination( -300.0f, -200.0f, 0.0f );
 
   Property::Map animationMapEntry;
-  animationMapEntry.Insert( "actor", "custom-animation-popup" );
+  animationMapEntry.Insert( "actor", "customAnimationPopup" );
   animationMapEntry.Insert( "property", "position" );
   animationMapEntry.Insert( "value", entryAnimationDestination );
   animationMapEntry.Insert( "property", "position" );
   animationMapEntry.Insert( "value", entryAnimationDestination );
-  animationMapEntry.Insert( "alpha-function", "EASE_OUT" );
+  animationMapEntry.Insert( "alphaFunction",  "EASE_OUT" );
 
   Property::Array timePeriodMapEntry;
   timePeriodMapEntry.PushBack( 0.0f );
   timePeriodMapEntry.PushBack( 1.0f );
 
 
   Property::Array timePeriodMapEntry;
   timePeriodMapEntry.PushBack( 0.0f );
   timePeriodMapEntry.PushBack( 1.0f );
 
-  animationMapEntry.Insert( "time-period", timePeriodMapEntry );
+  animationMapEntry.Insert( "timePeriod",  timePeriodMapEntry );
 
   Property::Map animationMapExit;
 
   Property::Map animationMapExit;
-  animationMapExit.Insert( "actor", "custom-animation-popup" );
+  animationMapExit.Insert( "actor", "customAnimationPopup" );
   animationMapExit.Insert( "property", "position" );
   animationMapExit.Insert( "value", exitAnimationDestination );
   animationMapExit.Insert( "property", "position" );
   animationMapExit.Insert( "value", exitAnimationDestination );
-  animationMapExit.Insert( "alpha-function", "EASE_IN" );
+  animationMapExit.Insert( "alphaFunction",  "EASE_IN" );
 
   Property::Array timePeriodMapExit;
   timePeriodMapExit.PushBack( 0.0f );
   timePeriodMapExit.PushBack( 1.0f );
 
 
   Property::Array timePeriodMapExit;
   timePeriodMapExit.PushBack( 0.0f );
   timePeriodMapExit.PushBack( 1.0f );
 
-  animationMapExit.Insert( "time-period", timePeriodMapExit );
+  animationMapExit.Insert( "timePeriod",  timePeriodMapExit );
 
   popup.SetProperty( Toolkit::Popup::Property::ENTRY_ANIMATION, animationMapEntry );
   popup.SetProperty( Toolkit::Popup::Property::EXIT_ANIMATION, animationMapExit );
 
   popup.SetProperty( Toolkit::Popup::Property::ENTRY_ANIMATION, animationMapEntry );
   popup.SetProperty( Toolkit::Popup::Property::EXIT_ANIMATION, animationMapExit );
@@ -1217,7 +1217,7 @@ int UtcDaliPopupPropertyTail(void)
   popup.SetDisplayState( Popup::SHOWN );
   application.SendNotification();
   application.Render();
   popup.SetDisplayState( Popup::SHOWN );
   application.SendNotification();
   application.Render();
-  tailActor = popup.FindChildByName( "tail-image" );
+  tailActor = popup.FindChildByName( "tailImage" );
   DALI_TEST_CHECK( tailActor );
 
   float baseValX = tailActor.GetCurrentWorldPosition().x;
   DALI_TEST_CHECK( tailActor );
 
   float baseValX = tailActor.GetCurrentWorldPosition().x;
@@ -1234,7 +1234,7 @@ int UtcDaliPopupPropertyTail(void)
   popup.SetDisplayState( Popup::SHOWN );
   application.SendNotification();
   application.Render();
   popup.SetDisplayState( Popup::SHOWN );
   application.SendNotification();
   application.Render();
-  tailActor = popup.FindChildByName( "tail-image" );
+  tailActor = popup.FindChildByName( "tailImage" );
   DALI_TEST_CHECK( tailActor );
 
   float baseValY = tailActor.GetCurrentWorldPosition().y;
   DALI_TEST_CHECK( tailActor );
 
   float baseValY = tailActor.GetCurrentWorldPosition().y;
@@ -1250,7 +1250,7 @@ int UtcDaliPopupPropertyTail(void)
   popup.SetDisplayState( Popup::SHOWN );
   application.SendNotification();
   application.Render();
   popup.SetDisplayState( Popup::SHOWN );
   application.SendNotification();
   application.Render();
-  tailActor = popup.FindChildByName( "tail-image" );
+  tailActor = popup.FindChildByName( "tailImage" );
   DALI_TEST_CHECK( tailActor );
   DALI_TEST_EQUALS( tailActor.GetCurrentWorldPosition().x, baseValX, TEST_LOCATION );
   DALI_TEST_GREATER( tailActor.GetCurrentWorldPosition().y, baseValY, TEST_LOCATION );
   DALI_TEST_CHECK( tailActor );
   DALI_TEST_EQUALS( tailActor.GetCurrentWorldPosition().x, baseValX, TEST_LOCATION );
   DALI_TEST_GREATER( tailActor.GetCurrentWorldPosition().y, baseValY, TEST_LOCATION );
@@ -1265,7 +1265,7 @@ int UtcDaliPopupPropertyTail(void)
   popup.SetDisplayState( Popup::SHOWN );
   application.SendNotification();
   application.Render();
   popup.SetDisplayState( Popup::SHOWN );
   application.SendNotification();
   application.Render();
-  tailActor = popup.FindChildByName( "tail-image" );
+  tailActor = popup.FindChildByName( "tailImage" );
   DALI_TEST_CHECK( tailActor );
   DALI_TEST_GREATER( tailActor.GetCurrentWorldPosition().x, baseValX, TEST_LOCATION );
   DALI_TEST_EQUALS( tailActor.GetCurrentWorldPosition().y, baseValY, TEST_LOCATION );
   DALI_TEST_CHECK( tailActor );
   DALI_TEST_GREATER( tailActor.GetCurrentWorldPosition().x, baseValX, TEST_LOCATION );
   DALI_TEST_EQUALS( tailActor.GetCurrentWorldPosition().y, baseValY, TEST_LOCATION );
@@ -1282,7 +1282,7 @@ int UtcDaliPopupTypeToast(void)
   ToolkitTestApplication application;
   tet_infoline( " UtcDaliPopupTypeToast" );
 
   ToolkitTestApplication application;
   tet_infoline( " UtcDaliPopupTypeToast" );
 
-  TypeInfo typeInfo = TypeRegistry::Get().GetTypeInfo( "popup-toast" );
+  TypeInfo typeInfo = TypeRegistry::Get().GetTypeInfo( "PopupToast" );
   DALI_TEST_CHECK( typeInfo )
 
   BaseHandle baseHandle = typeInfo.CreateInstance();
   DALI_TEST_CHECK( typeInfo )
 
   BaseHandle baseHandle = typeInfo.CreateInstance();
@@ -1365,7 +1365,7 @@ int UtcDaliPopupPropertyTypeRegistryConnectSignal(void)
 
   TestConnectionTrackerObject* testTracker = new TestConnectionTrackerObject();
   // Note: The emmision of this signals has already been tested in other tests.
 
   TestConnectionTrackerObject* testTracker = new TestConnectionTrackerObject();
   // Note: The emmision of this signals has already been tested in other tests.
-  DALI_TEST_CHECK( popup.ConnectSignal( testTracker, "touched-outside", PopupTestFunctor() ) );
+  DALI_TEST_CHECK( popup.ConnectSignal( testTracker, "touchedOutside",  PopupTestFunctor() ) );
   DALI_TEST_CHECK( popup.ConnectSignal( testTracker, "showing", PopupTestFunctor() ) );
   DALI_TEST_CHECK( popup.ConnectSignal( testTracker, "shown", PopupTestFunctor() ) );
   DALI_TEST_CHECK( popup.ConnectSignal( testTracker, "hiding", PopupTestFunctor() ) );
   DALI_TEST_CHECK( popup.ConnectSignal( testTracker, "showing", PopupTestFunctor() ) );
   DALI_TEST_CHECK( popup.ConnectSignal( testTracker, "shown", PopupTestFunctor() ) );
   DALI_TEST_CHECK( popup.ConnectSignal( testTracker, "hiding", PopupTestFunctor() ) );
index a3d65a7..d052c63 100644 (file)
@@ -275,8 +275,8 @@ int UtcDaliRendererFactoryGetColorRenderer1(void)
 
   Property::Map propertyMap;
   Vector4 testColor( 1.f, 0.5f, 0.3f, 0.2f );
 
   Property::Map propertyMap;
   Vector4 testColor( 1.f, 0.5f, 0.3f, 0.2f );
-  propertyMap.Insert("renderer-type", "color-renderer");
-  propertyMap.Insert("blend-color", testColor);
+  propertyMap.Insert("rendererType",  "colorRenderer");
+  propertyMap.Insert("blendColor",  testColor);
 
   ControlRenderer controlRenderer = factory.GetControlRenderer(propertyMap);
   DALI_TEST_CHECK( controlRenderer );
 
   ControlRenderer controlRenderer = factory.GetControlRenderer(propertyMap);
   DALI_TEST_CHECK( controlRenderer );
@@ -329,9 +329,9 @@ int UtcDaliRendererFactoryGetBorderRenderer1(void)
   Property::Map propertyMap;
   Vector4 testColor( 1.f, 0.5f, 0.3f, 0.2f );
   float testSize = 5.f;
   Property::Map propertyMap;
   Vector4 testColor( 1.f, 0.5f, 0.3f, 0.2f );
   float testSize = 5.f;
-  propertyMap.Insert("renderer-type", "border-renderer");
-  propertyMap.Insert("border-color", testColor);
-  propertyMap.Insert("border-size", testSize);
+  propertyMap.Insert("rendererType",  "borderRenderer");
+  propertyMap.Insert("borderColor",  testColor);
+  propertyMap.Insert("borderSize",  testSize);
 
   ControlRenderer controlRenderer = factory.GetControlRenderer(propertyMap);
   DALI_TEST_CHECK( controlRenderer );
 
   ControlRenderer controlRenderer = factory.GetControlRenderer(propertyMap);
   DALI_TEST_CHECK( controlRenderer );
@@ -411,23 +411,23 @@ int UtcDaliRendererFactoryGetLinearGradientRenderer(void)
   DALI_TEST_CHECK( factory );
 
   Property::Map propertyMap;
   DALI_TEST_CHECK( factory );
 
   Property::Map propertyMap;
-  propertyMap.Insert("renderer-type", "gradient-renderer");
+  propertyMap.Insert("rendererType",  "gradientRenderer");
 
   Vector2 start(-1.f, -1.f);
   Vector2 end(1.f, 1.f);
 
   Vector2 start(-1.f, -1.f);
   Vector2 end(1.f, 1.f);
-  propertyMap.Insert("gradient-start-position", start);
-  propertyMap.Insert("gradient-end-position", end);
-  propertyMap.Insert("gradient-spread-method", "repeat");
+  propertyMap.Insert("gradientStartPosition",   start);
+  propertyMap.Insert("gradientEndPosition",   end);
+  propertyMap.Insert("gradientSpreadMethod",   "repeat");
 
   Property::Array stopOffsets;
   stopOffsets.PushBack( 0.2f );
   stopOffsets.PushBack( 0.8f );
 
   Property::Array stopOffsets;
   stopOffsets.PushBack( 0.2f );
   stopOffsets.PushBack( 0.8f );
-  propertyMap.Insert("gradient-stop-offset", stopOffsets);
+  propertyMap.Insert("gradientStopOffset",   stopOffsets);
 
   Property::Array stopColors;
   stopColors.PushBack( Color::RED );
   stopColors.PushBack( Color::GREEN );
 
   Property::Array stopColors;
   stopColors.PushBack( Color::RED );
   stopColors.PushBack( Color::GREEN );
-  propertyMap.Insert("gradient-stop-color", stopColors);
+  propertyMap.Insert("gradientStopColor",   stopColors);
 
   ControlRenderer controlRenderer = factory.GetControlRenderer(propertyMap);
   DALI_TEST_CHECK( controlRenderer );
 
   ControlRenderer controlRenderer = factory.GetControlRenderer(propertyMap);
   DALI_TEST_CHECK( controlRenderer );
@@ -451,23 +451,23 @@ int UtcDaliRendererFactoryGetRadialGradientRenderer(void)
   DALI_TEST_CHECK( factory );
 
   Property::Map propertyMap;
   DALI_TEST_CHECK( factory );
 
   Property::Map propertyMap;
-  propertyMap.Insert("renderer-type", "gradient-renderer");
+  propertyMap.Insert("rendererType",  "gradientRenderer");
 
   Vector2 center(100.f, 100.f);
   float radius = 100.f;
 
   Vector2 center(100.f, 100.f);
   float radius = 100.f;
-  propertyMap.Insert("gradient-units", "user-space");
-  propertyMap.Insert("gradient-center", center);
-  propertyMap.Insert("gradient-radius", radius);
+  propertyMap.Insert("gradientUnits",  "userSpace");
+  propertyMap.Insert("gradientCenter",  center);
+  propertyMap.Insert("gradientRadius",  radius);
 
   Property::Array stopOffsets;
   stopOffsets.PushBack( 0.0f );
   stopOffsets.PushBack( 1.f );
 
   Property::Array stopOffsets;
   stopOffsets.PushBack( 0.0f );
   stopOffsets.PushBack( 1.f );
-  propertyMap.Insert("gradient-stop-offset", stopOffsets);
+  propertyMap.Insert("gradientStopOffset",   stopOffsets);
 
   Property::Array stopColors;
   stopColors.PushBack( Color::RED );
   stopColors.PushBack( Color::GREEN );
 
   Property::Array stopColors;
   stopColors.PushBack( Color::RED );
   stopColors.PushBack( Color::GREEN );
-  propertyMap.Insert("gradient-stop-color", stopColors);
+  propertyMap.Insert("gradientStopColor",   stopColors);
 
   ControlRenderer controlRenderer = factory.GetControlRenderer(propertyMap);
   DALI_TEST_CHECK( controlRenderer );
 
   ControlRenderer controlRenderer = factory.GetControlRenderer(propertyMap);
   DALI_TEST_CHECK( controlRenderer );
@@ -496,8 +496,8 @@ int UtcDaliRendererFactoryGetImageRenderer1(void)
   DALI_TEST_CHECK( factory );
 
   Property::Map propertyMap;
   DALI_TEST_CHECK( factory );
 
   Property::Map propertyMap;
-  propertyMap.Insert( "renderer-type", "image-renderer" );
-  propertyMap.Insert( "image-url", TEST_IMAGE_FILE_NAME );
+  propertyMap.Insert( "rendererType",  "imageRenderer" );
+  propertyMap.Insert( "imageUrl",  TEST_IMAGE_FILE_NAME );
 
   ControlRenderer controlRenderer = factory.GetControlRenderer( propertyMap );
   DALI_TEST_CHECK( controlRenderer );
 
   ControlRenderer controlRenderer = factory.GetControlRenderer( propertyMap );
   DALI_TEST_CHECK( controlRenderer );
@@ -555,8 +555,8 @@ int UtcDaliRendererFactoryGetNPatchRenderer1(void)
   Integration::ResourcePointer ninePatchResource = CustomizeNinePatch( application, ninePatchImageWidth, ninePatchImageHeight, stretchRangesX, stretchRangesY );
 
   Property::Map propertyMap;
   Integration::ResourcePointer ninePatchResource = CustomizeNinePatch( application, ninePatchImageWidth, ninePatchImageHeight, stretchRangesX, stretchRangesY );
 
   Property::Map propertyMap;
-  propertyMap.Insert( "renderer-type", "n-patch-renderer" );
-  propertyMap.Insert( "image-url", TEST_NPATCH_FILE_NAME );
+  propertyMap.Insert( "rendererType",  "nPatchRenderer" );
+  propertyMap.Insert( "imageUrl",  TEST_NPATCH_FILE_NAME );
   {
     tet_infoline( "whole grid" );
     ControlRenderer controlRenderer = factory.GetControlRenderer( propertyMap );
   {
     tet_infoline( "whole grid" );
     ControlRenderer controlRenderer = factory.GetControlRenderer( propertyMap );
@@ -571,7 +571,7 @@ int UtcDaliRendererFactoryGetNPatchRenderer1(void)
     DALI_TEST_EQUALS( textureUnit, 0, TEST_LOCATION );
   }
 
     DALI_TEST_EQUALS( textureUnit, 0, TEST_LOCATION );
   }
 
-  propertyMap.Insert( "border-only", true );
+  propertyMap.Insert( "borderOnly",  true );
   {
     tet_infoline( "border only" );
     ControlRenderer controlRenderer = factory.GetControlRenderer( propertyMap );
   {
     tet_infoline( "border only" );
     ControlRenderer controlRenderer = factory.GetControlRenderer( propertyMap );
@@ -611,8 +611,8 @@ int UtcDaliRendererFactoryGetNPatchRenderer2(void)
   Integration::ResourcePointer ninePatchResource = CustomizeNinePatch( application, ninePatchImageWidth, ninePatchImageHeight, stretchRangesX, stretchRangesY );
 
   Property::Map propertyMap;
   Integration::ResourcePointer ninePatchResource = CustomizeNinePatch( application, ninePatchImageWidth, ninePatchImageHeight, stretchRangesX, stretchRangesY );
 
   Property::Map propertyMap;
-  propertyMap.Insert( "renderer-type", "n-patch-renderer" );
-  propertyMap.Insert( "image-url", TEST_NPATCH_FILE_NAME );
+  propertyMap.Insert( "rendererType",  "nPatchRenderer" );
+  propertyMap.Insert( "imageUrl",  TEST_NPATCH_FILE_NAME );
   {
     ControlRenderer controlRenderer = factory.GetControlRenderer( propertyMap );
     DALI_TEST_CHECK( controlRenderer );
   {
     ControlRenderer controlRenderer = factory.GetControlRenderer( propertyMap );
     DALI_TEST_CHECK( controlRenderer );
@@ -629,7 +629,7 @@ int UtcDaliRendererFactoryGetNPatchRenderer2(void)
     DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
   }
 
     DALI_TEST_CHECK( actor.GetRendererCount() == 0u );
   }
 
-  propertyMap.Insert( "border-only", true );
+  propertyMap.Insert( "borderOnly",  true );
   {
     tet_infoline( "border only" );
     ControlRenderer controlRenderer = factory.GetControlRenderer( propertyMap );
   {
     tet_infoline( "border only" );
     ControlRenderer controlRenderer = factory.GetControlRenderer( propertyMap );
@@ -751,8 +751,8 @@ int UtcDaliRendererFactoryGetNPatchRendererN2(void)
   DALI_TEST_CHECK( factory );
 
   Property::Map propertyMap;
   DALI_TEST_CHECK( factory );
 
   Property::Map propertyMap;
-  propertyMap.Insert( "renderer-type", "n-patch-renderer" );
-  propertyMap.Insert( "image-url", 111 );
+  propertyMap.Insert( "rendererType",  "nPatchRenderer" );
+  propertyMap.Insert( "imageUrl",  111 );
 
   ControlRenderer controlRenderer = factory.GetControlRenderer( propertyMap );
   DALI_TEST_CHECK( controlRenderer );
 
   ControlRenderer controlRenderer = factory.GetControlRenderer( propertyMap );
   DALI_TEST_CHECK( controlRenderer );
index a56ca7c..ff4f5b9 100644 (file)
@@ -265,15 +265,15 @@ int UtcDaliToolkitScrollBarSetScrollPropertySourceP(void)
   Stage::GetCurrent().Add( sourceActor );
 
   // Register the scroll properties
   Stage::GetCurrent().Add( sourceActor );
 
   // Register the scroll properties
-  Property::Index propertyScrollPosition = sourceActor.RegisterProperty( "source-position", 0.0f );
-  Property::Index propertyMinScrollPosition = sourceActor.RegisterProperty( "source-position-min", 0.0f );
-  Property::Index propertyMaxScrollPosition = sourceActor.RegisterProperty( "source-position-max", 100.0f );
-  Property::Index propertyScrollContentSize = sourceActor.RegisterProperty( "source-content-size", 500.0f );
+  Property::Index propertyScrollPosition = sourceActor.RegisterProperty( "sourcePosition",  0.0f );
+  Property::Index propertyMinScrollPosition = sourceActor.RegisterProperty( "sourcePositionMin",   0.0f );
+  Property::Index propertyMaxScrollPosition = sourceActor.RegisterProperty( "sourcePositionMax",   100.0f );
+  Property::Index propertyScrollContentSize = sourceActor.RegisterProperty( "sourceContentSize",   500.0f );
 
 
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "source-position" ), propertyScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "source-position-min" ), propertyMinScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "source-position-max" ), propertyMaxScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "source-content-size" ), propertyScrollContentSize, TEST_LOCATION );
+  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourcePosition" ), propertyScrollPosition, TEST_LOCATION );
+  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourcePositionMin" ), propertyMinScrollPosition, TEST_LOCATION );
+  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourcePositionMax" ), propertyMaxScrollPosition, TEST_LOCATION );
+  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourceContentSize" ), propertyScrollContentSize, TEST_LOCATION );
 
   // Set the source of the scroll position properties.
   scrollBar.SetScrollPropertySource(sourceActor, propertyScrollPosition, propertyMinScrollPosition, propertyMaxScrollPosition, propertyScrollContentSize);
 
   // Set the source of the scroll position properties.
   scrollBar.SetScrollPropertySource(sourceActor, propertyScrollPosition, propertyMinScrollPosition, propertyMaxScrollPosition, propertyScrollContentSize);
@@ -343,15 +343,15 @@ int UtcDaliToolkitScrollBarSetScrollPropertySourceP(void)
   Stage::GetCurrent().Add( newSourceActor );
 
   // Register the scroll properties
   Stage::GetCurrent().Add( newSourceActor );
 
   // Register the scroll properties
-  Property::Index newPropertyScrollPosition = newSourceActor.RegisterProperty( "source-position", 0.0f );
-  Property::Index newPropertyMinScrollPosition = newSourceActor.RegisterProperty( "source-position-min", 0.0f );
-  Property::Index newPropertyMaxScrollPosition = newSourceActor.RegisterProperty( "source-position-max", 200.0f );
-  Property::Index newPropertyScrollContentSize = newSourceActor.RegisterProperty( "source-content-size", 400.0f );
+  Property::Index newPropertyScrollPosition = newSourceActor.RegisterProperty( "sourcePosition",  0.0f );
+  Property::Index newPropertyMinScrollPosition = newSourceActor.RegisterProperty( "sourcePositionMin",   0.0f );
+  Property::Index newPropertyMaxScrollPosition = newSourceActor.RegisterProperty( "sourcePositionMax",   200.0f );
+  Property::Index newPropertyScrollContentSize = newSourceActor.RegisterProperty( "sourceContentSize",   400.0f );
 
 
-  DALI_TEST_EQUALS( newSourceActor.GetPropertyIndex( "source-position" ), newPropertyScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( newSourceActor.GetPropertyIndex( "source-position-min" ), newPropertyMinScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( newSourceActor.GetPropertyIndex( "source-position-max" ), newPropertyMaxScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( newSourceActor.GetPropertyIndex( "source-content-size" ), newPropertyScrollContentSize, TEST_LOCATION );
+  DALI_TEST_EQUALS( newSourceActor.GetPropertyIndex( "sourcePosition" ), newPropertyScrollPosition, TEST_LOCATION );
+  DALI_TEST_EQUALS( newSourceActor.GetPropertyIndex( "sourcePositionMin" ), newPropertyMinScrollPosition, TEST_LOCATION );
+  DALI_TEST_EQUALS( newSourceActor.GetPropertyIndex( "sourcePositionMax" ), newPropertyMaxScrollPosition, TEST_LOCATION );
+  DALI_TEST_EQUALS( newSourceActor.GetPropertyIndex( "sourceContentSize" ), newPropertyScrollContentSize, TEST_LOCATION );
 
   // Change the source of the scroll position properties to be the new source actor.
   scrollBar.SetScrollPropertySource(newSourceActor, newPropertyScrollPosition, newPropertyMinScrollPosition, newPropertyMaxScrollPosition, newPropertyScrollContentSize);
 
   // Change the source of the scroll position properties to be the new source actor.
   scrollBar.SetScrollPropertySource(newSourceActor, newPropertyScrollPosition, newPropertyMinScrollPosition, newPropertyMaxScrollPosition, newPropertyScrollContentSize);
@@ -513,15 +513,15 @@ int UtcDaliToolkitScrollBarSetScrollPositionIntervalsP(void)
   Stage::GetCurrent().Add( sourceActor );
 
   // Register the scroll properties
   Stage::GetCurrent().Add( sourceActor );
 
   // Register the scroll properties
-  Property::Index propertyScrollPosition = sourceActor.RegisterProperty( "source-position", 0.0f );
-  Property::Index propertyMinScrollPosition = sourceActor.RegisterProperty( "source-position-min", 0.0f );
-  Property::Index propertyMaxScrollPosition = sourceActor.RegisterProperty( "source-position-max", 800.0f );
-  Property::Index propertyScrollContentSize = sourceActor.RegisterProperty( "source-content-size", 2000.0f );
+  Property::Index propertyScrollPosition = sourceActor.RegisterProperty( "sourcePosition",  0.0f );
+  Property::Index propertyMinScrollPosition = sourceActor.RegisterProperty( "sourcePositionMin",   0.0f );
+  Property::Index propertyMaxScrollPosition = sourceActor.RegisterProperty( "sourcePositionMax",   800.0f );
+  Property::Index propertyScrollContentSize = sourceActor.RegisterProperty( "sourceContentSize",   2000.0f );
 
 
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "source-position" ), propertyScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "source-position-min" ), propertyMinScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "source-position-max" ), propertyMaxScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "source-content-size" ), propertyScrollContentSize, TEST_LOCATION );
+  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourcePosition" ), propertyScrollPosition, TEST_LOCATION );
+  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourcePositionMin" ), propertyMinScrollPosition, TEST_LOCATION );
+  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourcePositionMax" ), propertyMaxScrollPosition, TEST_LOCATION );
+  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourceContentSize" ), propertyScrollContentSize, TEST_LOCATION );
 
   // Set the source of the scroll position properties.
   scrollBar.SetScrollPropertySource(sourceActor, propertyScrollPosition, propertyMinScrollPosition, propertyMaxScrollPosition, propertyScrollContentSize);
 
   // Set the source of the scroll position properties.
   scrollBar.SetScrollPropertySource(sourceActor, propertyScrollPosition, propertyMinScrollPosition, propertyMaxScrollPosition, propertyScrollContentSize);
@@ -675,15 +675,15 @@ int UtcDaliToolkitScrollBarSetIndicatorHeightPolicyP(void)
   Stage::GetCurrent().Add( sourceActor );
 
   // Register the scroll properties
   Stage::GetCurrent().Add( sourceActor );
 
   // Register the scroll properties
-  Property::Index propertyScrollPosition = sourceActor.RegisterProperty( "source-position", 0.0f );
-  Property::Index propertyMinScrollPosition = sourceActor.RegisterProperty( "source-position-min", 0.0f );
-  Property::Index propertyMaxScrollPosition = sourceActor.RegisterProperty( "source-position-max", 100.0f );
-  Property::Index propertyScrollContentSize = sourceActor.RegisterProperty( "source-content-size", 500.0f );
+  Property::Index propertyScrollPosition = sourceActor.RegisterProperty( "sourcePosition",  0.0f );
+  Property::Index propertyMinScrollPosition = sourceActor.RegisterProperty( "sourcePositionMin",   0.0f );
+  Property::Index propertyMaxScrollPosition = sourceActor.RegisterProperty( "sourcePositionMax",   100.0f );
+  Property::Index propertyScrollContentSize = sourceActor.RegisterProperty( "sourceContentSize",   500.0f );
 
 
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "source-position" ), propertyScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "source-position-min" ), propertyMinScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "source-position-max" ), propertyMaxScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "source-content-size" ), propertyScrollContentSize, TEST_LOCATION );
+  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourcePosition" ), propertyScrollPosition, TEST_LOCATION );
+  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourcePositionMin" ), propertyMinScrollPosition, TEST_LOCATION );
+  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourcePositionMax" ), propertyMaxScrollPosition, TEST_LOCATION );
+  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourceContentSize" ), propertyScrollContentSize, TEST_LOCATION );
 
   // Set the source of the scroll position properties.
   scrollBar.SetScrollPropertySource(sourceActor, propertyScrollPosition, propertyMinScrollPosition, propertyMaxScrollPosition, propertyScrollContentSize);
 
   // Set the source of the scroll position properties.
   scrollBar.SetScrollPropertySource(sourceActor, propertyScrollPosition, propertyMinScrollPosition, propertyMaxScrollPosition, propertyScrollContentSize);
@@ -1355,15 +1355,15 @@ int UtcDaliToolkitScrollBarPanFinishedSignalP(void)
   Stage::GetCurrent().Add( sourceActor );
 
   // Register the scroll properties
   Stage::GetCurrent().Add( sourceActor );
 
   // Register the scroll properties
-  Property::Index propertyScrollPosition = sourceActor.RegisterProperty( "source-position", 0.0f );
-  Property::Index propertyMinScrollPosition = sourceActor.RegisterProperty( "source-position-min", 0.0f );
-  Property::Index propertyMaxScrollPosition = sourceActor.RegisterProperty( "source-position-max", 100.0f );
-  Property::Index propertyScrollContentSize = sourceActor.RegisterProperty( "source-content-size", 500.0f );
+  Property::Index propertyScrollPosition = sourceActor.RegisterProperty( "sourcePosition",  0.0f );
+  Property::Index propertyMinScrollPosition = sourceActor.RegisterProperty( "sourcePositionMin",   0.0f );
+  Property::Index propertyMaxScrollPosition = sourceActor.RegisterProperty( "sourcePositionMax",   100.0f );
+  Property::Index propertyScrollContentSize = sourceActor.RegisterProperty( "sourceContentSize",   500.0f );
 
 
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "source-position" ), propertyScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "source-position-min" ), propertyMinScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "source-position-max" ), propertyMaxScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "source-content-size" ), propertyScrollContentSize, TEST_LOCATION );
+  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourcePosition" ), propertyScrollPosition, TEST_LOCATION );
+  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourcePositionMin" ), propertyMinScrollPosition, TEST_LOCATION );
+  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourcePositionMax" ), propertyMaxScrollPosition, TEST_LOCATION );
+  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourceContentSize" ), propertyScrollContentSize, TEST_LOCATION );
 
   // Set the source of the scroll position properties.
   scrollBar.SetScrollPropertySource(sourceActor, propertyScrollPosition, propertyMinScrollPosition, propertyMaxScrollPosition, propertyScrollContentSize);
 
   // Set the source of the scroll position properties.
   scrollBar.SetScrollPropertySource(sourceActor, propertyScrollPosition, propertyMinScrollPosition, propertyMaxScrollPosition, propertyScrollContentSize);
@@ -1413,15 +1413,15 @@ int UtcDaliToolkitScrollBarPanFinishedSignalN(void)
   Stage::GetCurrent().Add( sourceActor );
 
   // Register the scroll properties
   Stage::GetCurrent().Add( sourceActor );
 
   // Register the scroll properties
-  Property::Index propertyScrollPosition = sourceActor.RegisterProperty( "source-position", 0.0f );
-  Property::Index propertyMinScrollPosition = sourceActor.RegisterProperty( "source-position-min", 0.0f );
-  Property::Index propertyMaxScrollPosition = sourceActor.RegisterProperty( "source-position-max", 100.0f );
-  Property::Index propertyScrollContentSize = sourceActor.RegisterProperty( "source-content-size", 500.0f );
+  Property::Index propertyScrollPosition = sourceActor.RegisterProperty( "sourcePosition",  0.0f );
+  Property::Index propertyMinScrollPosition = sourceActor.RegisterProperty( "sourcePositionMin",   0.0f );
+  Property::Index propertyMaxScrollPosition = sourceActor.RegisterProperty( "sourcePositionMax",   100.0f );
+  Property::Index propertyScrollContentSize = sourceActor.RegisterProperty( "sourceContentSize",   500.0f );
 
 
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "source-position" ), propertyScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "source-position-min" ), propertyMinScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "source-position-max" ), propertyMaxScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "source-content-size" ), propertyScrollContentSize, TEST_LOCATION );
+  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourcePosition" ), propertyScrollPosition, TEST_LOCATION );
+  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourcePositionMin" ), propertyMinScrollPosition, TEST_LOCATION );
+  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourcePositionMax" ), propertyMaxScrollPosition, TEST_LOCATION );
+  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourceContentSize" ), propertyScrollContentSize, TEST_LOCATION );
 
   // Set the source of the scroll position properties.
   scrollBar.SetScrollPropertySource(sourceActor, propertyScrollPosition, propertyMinScrollPosition, propertyMaxScrollPosition, propertyScrollContentSize);
 
   // Set the source of the scroll position properties.
   scrollBar.SetScrollPropertySource(sourceActor, propertyScrollPosition, propertyMinScrollPosition, propertyMaxScrollPosition, propertyScrollContentSize);
@@ -1467,15 +1467,15 @@ int UtcDaliToolkitScrollBarScrollPositionIntervalReachedSignalP(void)
   Stage::GetCurrent().Add( sourceActor );
 
   // Register the scroll properties
   Stage::GetCurrent().Add( sourceActor );
 
   // Register the scroll properties
-  Property::Index propertyScrollPosition = sourceActor.RegisterProperty( "source-position", 0.0f );
-  Property::Index propertyMinScrollPosition = sourceActor.RegisterProperty( "source-position-min", 0.0f );
-  Property::Index propertyMaxScrollPosition = sourceActor.RegisterProperty( "source-position-max", 800.0f );
-  Property::Index propertyScrollContentSize = sourceActor.RegisterProperty( "source-content-size", 2000.0f );
+  Property::Index propertyScrollPosition = sourceActor.RegisterProperty( "sourcePosition",  0.0f );
+  Property::Index propertyMinScrollPosition = sourceActor.RegisterProperty( "sourcePositionMin",   0.0f );
+  Property::Index propertyMaxScrollPosition = sourceActor.RegisterProperty( "sourcePositionMax",   800.0f );
+  Property::Index propertyScrollContentSize = sourceActor.RegisterProperty( "sourceContentSize",   2000.0f );
 
 
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "source-position" ), propertyScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "source-position-min" ), propertyMinScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "source-position-max" ), propertyMaxScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "source-content-size" ), propertyScrollContentSize, TEST_LOCATION );
+  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourcePosition" ), propertyScrollPosition, TEST_LOCATION );
+  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourcePositionMin" ), propertyMinScrollPosition, TEST_LOCATION );
+  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourcePositionMax" ), propertyMaxScrollPosition, TEST_LOCATION );
+  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourceContentSize" ), propertyScrollContentSize, TEST_LOCATION );
 
   // Set the source of the scroll position properties.
   scrollBar.SetScrollPropertySource(sourceActor, propertyScrollPosition, propertyMinScrollPosition, propertyMaxScrollPosition, propertyScrollContentSize);
 
   // Set the source of the scroll position properties.
   scrollBar.SetScrollPropertySource(sourceActor, propertyScrollPosition, propertyMinScrollPosition, propertyMaxScrollPosition, propertyScrollContentSize);
@@ -1575,15 +1575,15 @@ int UtcDaliToolkitScrollBarScrollPositionIntervalReachedSignalN(void)
   Stage::GetCurrent().Add( sourceActor );
 
   // Register the scroll properties
   Stage::GetCurrent().Add( sourceActor );
 
   // Register the scroll properties
-  Property::Index propertyScrollPosition = sourceActor.RegisterProperty( "source-position", 0.0f );
-  Property::Index propertyMinScrollPosition = sourceActor.RegisterProperty( "source-position-min", 0.0f );
-  Property::Index propertyMaxScrollPosition = sourceActor.RegisterProperty( "source-position-max", 800.0f );
-  Property::Index propertyScrollContentSize = sourceActor.RegisterProperty( "source-content-size", 2000.0f );
-
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "source-position" ), propertyScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "source-position-min" ), propertyMinScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "source-position-max" ), propertyMaxScrollPosition, TEST_LOCATION );
-  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "source-content-size" ), propertyScrollContentSize, TEST_LOCATION );
+  Property::Index propertyScrollPosition = sourceActor.RegisterProperty( "sourcePosition",  0.0f );
+  Property::Index propertyMinScrollPosition = sourceActor.RegisterProperty( "sourcePositionMin",   0.0f );
+  Property::Index propertyMaxScrollPosition = sourceActor.RegisterProperty( "sourcePositionMax",   800.0f );
+  Property::Index propertyScrollContentSize = sourceActor.RegisterProperty( "sourceContentSize",   2000.0f );
+
+  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourcePosition" ), propertyScrollPosition, TEST_LOCATION );
+  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourcePositionMin" ), propertyMinScrollPosition, TEST_LOCATION );
+  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourcePositionMax" ), propertyMaxScrollPosition, TEST_LOCATION );
+  DALI_TEST_EQUALS( sourceActor.GetPropertyIndex( "sourceContentSize" ), propertyScrollContentSize, TEST_LOCATION );
 
   // Set the source of the scroll position properties.
   scrollBar.SetScrollPropertySource(sourceActor, propertyScrollPosition, propertyMinScrollPosition, propertyMaxScrollPosition, propertyScrollContentSize);
 
   // Set the source of the scroll position properties.
   scrollBar.SetScrollPropertySource(sourceActor, propertyScrollPosition, propertyMinScrollPosition, propertyMaxScrollPosition, propertyScrollContentSize);
index fde3088..96ffb55 100644 (file)
@@ -136,28 +136,28 @@ int UtcDaliCreateDissolveEffect( bool highPrecision )
   Property::Map customShader;
   DALI_TEST_CHECK( customShaderValue->Get( customShader ) );
 
   Property::Map customShader;
   DALI_TEST_CHECK( customShaderValue->Get( customShader ) );
 
-  Property::Value* vertexShaderValue = customShader.Find( "vertex-shader" );
+  Property::Value* vertexShaderValue = customShader.Find( "vertexShader" );
   DALI_TEST_CHECK( vertexShaderValue );
 
   std::string vertexShader;
   DALI_TEST_CHECK( vertexShaderValue->Get( vertexShader ) );
   DALI_TEST_CHECK( !vertexShader.empty() );
 
   DALI_TEST_CHECK( vertexShaderValue );
 
   std::string vertexShader;
   DALI_TEST_CHECK( vertexShaderValue->Get( vertexShader ) );
   DALI_TEST_CHECK( !vertexShader.empty() );
 
-  Property::Value* fragmentShaderValue = customShader.Find( "fragment-shader" );
+  Property::Value* fragmentShaderValue = customShader.Find( "fragmentShader" );
   DALI_TEST_CHECK( fragmentShaderValue );
 
   std::string fragmentShader;
   DALI_TEST_CHECK( fragmentShaderValue->Get( fragmentShader ) );
   DALI_TEST_CHECK( !fragmentShader.empty() );
 
   DALI_TEST_CHECK( fragmentShaderValue );
 
   std::string fragmentShader;
   DALI_TEST_CHECK( fragmentShaderValue->Get( fragmentShader ) );
   DALI_TEST_CHECK( !fragmentShader.empty() );
 
-  Property::Value* gridXValue = customShader.Find( "subdivide-grid-x" );
+  Property::Value* gridXValue = customShader.Find( "subdivideGridX" );
   DALI_TEST_CHECK( gridXValue );
 
   int gridX = 0;
   DALI_TEST_CHECK( gridXValue->Get( gridX ) );
   DALI_TEST_CHECK( gridX > 1 );
 
   DALI_TEST_CHECK( gridXValue );
 
   int gridX = 0;
   DALI_TEST_CHECK( gridXValue->Get( gridX ) );
   DALI_TEST_CHECK( gridX > 1 );
 
-  Property::Value* gridYValue = customShader.Find( "subdivide-grid-y" );
+  Property::Value* gridYValue = customShader.Find( "subdivideGridY" );
   DALI_TEST_CHECK( gridYValue );
 
   int gridY = 0;
   DALI_TEST_CHECK( gridYValue );
 
   int gridY = 0;
@@ -169,7 +169,7 @@ int UtcDaliCreateDissolveEffect( bool highPrecision )
 
   std::string hints;
   DALI_TEST_CHECK( hintsValue->Get( hints ) );
 
   std::string hints;
   DALI_TEST_CHECK( hintsValue->Get( hints ) );
-  DALI_TEST_CHECK( hints == "output-is-transparent" );
+  DALI_TEST_CHECK( hints == "outputIsTransparent" );
 
   Actor actor = Actor::New();
   Toolkit::DissolveEffectSetCentralLine( actor, Vector2::ONE, Vector2::ONE, 0.0f );
 
   Actor actor = Actor::New();
   Toolkit::DissolveEffectSetCentralLine( actor, Vector2::ONE, Vector2::ONE, 0.0f );
@@ -211,17 +211,17 @@ int UtcDaliCreateDissolveEffect(void)
   Property::Map customShader;
   DALI_TEST_CHECK( customShaderValue->Get( customShader ) );
 
   Property::Map customShader;
   DALI_TEST_CHECK( customShaderValue->Get( customShader ) );
 
-  Property::Value* vertexShaderValue = customShader.Find( "vertex-shader" );
+  Property::Value* vertexShaderValue = customShader.Find( "vertexShader" );
   DALI_TEST_CHECK( !vertexShaderValue );
 
   DALI_TEST_CHECK( !vertexShaderValue );
 
-  Property::Value* fragmentShaderValue = customShader.Find( "fragment-shader" );
+  Property::Value* fragmentShaderValue = customShader.Find( "fragmentShader" );
   DALI_TEST_CHECK( fragmentShaderValue );
 
   std::string fragmentShader;
   DALI_TEST_CHECK( fragmentShaderValue->Get( fragmentShader ) );
   DALI_TEST_CHECK( !fragmentShader.empty() );
 
   DALI_TEST_CHECK( fragmentShaderValue );
 
   std::string fragmentShader;
   DALI_TEST_CHECK( fragmentShaderValue->Get( fragmentShader ) );
   DALI_TEST_CHECK( !fragmentShader.empty() );
 
-  Property::Value* gridXValue = customShader.Find( "subdivide-grid-x" );
+  Property::Value* gridXValue = customShader.Find( "subdivideGridX" );
   DALI_TEST_CHECK( !gridXValue );
 
   Property::Value* hintsValue = customShader.Find( "hints" );
   DALI_TEST_CHECK( !gridXValue );
 
   Property::Value* hintsValue = customShader.Find( "hints" );
@@ -229,7 +229,7 @@ int UtcDaliCreateDissolveEffect(void)
 
   std::string hints;
   DALI_TEST_CHECK( hintsValue->Get( hints ) );
 
   std::string hints;
   DALI_TEST_CHECK( hintsValue->Get( hints ) );
-  DALI_TEST_CHECK( hints == "output-is-transparent" );
+  DALI_TEST_CHECK( hints == "outputIsTransparent" );
 
   END_TEST;
 }
 
   END_TEST;
 }
@@ -289,28 +289,28 @@ int UtcDaliCreateMotionBlurEffect(void)
   Property::Map customShader;
   DALI_TEST_CHECK( customShaderValue->Get( customShader ) );
 
   Property::Map customShader;
   DALI_TEST_CHECK( customShaderValue->Get( customShader ) );
 
-  Property::Value* vertexShaderValue = customShader.Find( "vertex-shader" );
+  Property::Value* vertexShaderValue = customShader.Find( "vertexShader" );
   DALI_TEST_CHECK( vertexShaderValue );
 
   std::string vertexShader;
   DALI_TEST_CHECK( vertexShaderValue->Get( vertexShader ) );
   DALI_TEST_CHECK( !vertexShader.empty() );
 
   DALI_TEST_CHECK( vertexShaderValue );
 
   std::string vertexShader;
   DALI_TEST_CHECK( vertexShaderValue->Get( vertexShader ) );
   DALI_TEST_CHECK( !vertexShader.empty() );
 
-  Property::Value* fragmentShaderValue = customShader.Find( "fragment-shader" );
+  Property::Value* fragmentShaderValue = customShader.Find( "fragmentShader" );
   DALI_TEST_CHECK( fragmentShaderValue );
 
   std::string fragmentShader;
   DALI_TEST_CHECK( fragmentShaderValue->Get( fragmentShader ) );
   DALI_TEST_CHECK( !fragmentShader.empty() );
 
   DALI_TEST_CHECK( fragmentShaderValue );
 
   std::string fragmentShader;
   DALI_TEST_CHECK( fragmentShaderValue->Get( fragmentShader ) );
   DALI_TEST_CHECK( !fragmentShader.empty() );
 
-  Property::Value* gridXValue = customShader.Find( "subdivide-grid-x" );
+  Property::Value* gridXValue = customShader.Find( "subdivideGridX" );
   DALI_TEST_CHECK( gridXValue );
 
   int gridX = 0;
   DALI_TEST_CHECK( gridXValue->Get( gridX ) );
   DALI_TEST_CHECK( gridX > 1 );
 
   DALI_TEST_CHECK( gridXValue );
 
   int gridX = 0;
   DALI_TEST_CHECK( gridXValue->Get( gridX ) );
   DALI_TEST_CHECK( gridX > 1 );
 
-  Property::Value* gridYValue = customShader.Find( "subdivide-grid-y" );
+  Property::Value* gridYValue = customShader.Find( "subdivideGridY" );
   DALI_TEST_CHECK( gridYValue );
 
   int gridY = 0;
   DALI_TEST_CHECK( gridYValue );
 
   int gridY = 0;
@@ -322,7 +322,7 @@ int UtcDaliCreateMotionBlurEffect(void)
 
   std::string hints;
   DALI_TEST_CHECK( hintsValue->Get( hints ) );
 
   std::string hints;
   DALI_TEST_CHECK( hintsValue->Get( hints ) );
-  DALI_TEST_CHECK( hints == "output-is-transparent" );
+  DALI_TEST_CHECK( hints == "outputIsTransparent" );
 
   unsigned int sampleCount( 4 );
   Actor actor = Actor::New();
 
   unsigned int sampleCount( 4 );
   Actor actor = Actor::New();
@@ -352,28 +352,28 @@ int UtcDaliCreateMotionStretchEffect(void)
   Property::Map customShader;
   DALI_TEST_CHECK( customShaderValue->Get( customShader ) );
 
   Property::Map customShader;
   DALI_TEST_CHECK( customShaderValue->Get( customShader ) );
 
-  Property::Value* vertexShaderValue = customShader.Find( "vertex-shader" );
+  Property::Value* vertexShaderValue = customShader.Find( "vertexShader" );
   DALI_TEST_CHECK( vertexShaderValue );
 
   std::string vertexShader;
   DALI_TEST_CHECK( vertexShaderValue->Get( vertexShader ) );
   DALI_TEST_CHECK( !vertexShader.empty() );
 
   DALI_TEST_CHECK( vertexShaderValue );
 
   std::string vertexShader;
   DALI_TEST_CHECK( vertexShaderValue->Get( vertexShader ) );
   DALI_TEST_CHECK( !vertexShader.empty() );
 
-  Property::Value* fragmentShaderValue = customShader.Find( "fragment-shader" );
+  Property::Value* fragmentShaderValue = customShader.Find( "fragmentShader" );
   DALI_TEST_CHECK( fragmentShaderValue );
 
   std::string fragmentShader;
   DALI_TEST_CHECK( fragmentShaderValue->Get( fragmentShader ) );
   DALI_TEST_CHECK( !fragmentShader.empty() );
 
   DALI_TEST_CHECK( fragmentShaderValue );
 
   std::string fragmentShader;
   DALI_TEST_CHECK( fragmentShaderValue->Get( fragmentShader ) );
   DALI_TEST_CHECK( !fragmentShader.empty() );
 
-  Property::Value* gridXValue = customShader.Find( "subdivide-grid-x" );
+  Property::Value* gridXValue = customShader.Find( "subdivideGridX" );
   DALI_TEST_CHECK( gridXValue );
 
   int gridX = 0;
   DALI_TEST_CHECK( gridXValue->Get( gridX ) );
   DALI_TEST_CHECK( gridX > 1 );
 
   DALI_TEST_CHECK( gridXValue );
 
   int gridX = 0;
   DALI_TEST_CHECK( gridXValue->Get( gridX ) );
   DALI_TEST_CHECK( gridX > 1 );
 
-  Property::Value* gridYValue = customShader.Find( "subdivide-grid-y" );
+  Property::Value* gridYValue = customShader.Find( "subdivideGridY" );
   DALI_TEST_CHECK( gridYValue );
 
   int gridY = 0;
   DALI_TEST_CHECK( gridYValue );
 
   int gridY = 0;
@@ -385,7 +385,7 @@ int UtcDaliCreateMotionStretchEffect(void)
 
   std::string hints;
   DALI_TEST_CHECK( hintsValue->Get( hints ) );
 
   std::string hints;
   DALI_TEST_CHECK( hintsValue->Get( hints ) );
-  DALI_TEST_CHECK( hints == "output-is-transparent" );
+  DALI_TEST_CHECK( hints == "outputIsTransparent" );
 
   Actor actor = Actor::New();
   Toolkit::SetMotionStretchProperties( actor );
 
   Actor actor = Actor::New();
   Toolkit::SetMotionStretchProperties( actor );
index 14d183b..708fa3c 100644 (file)
@@ -39,9 +39,9 @@ namespace
 
 const char* const PROPERTY_NAME_ROWS = "rows";
 const char* const PROPERTY_NAME_COLUMNS = "columns";
 
 const char* const PROPERTY_NAME_ROWS = "rows";
 const char* const PROPERTY_NAME_COLUMNS = "columns";
-const char* const PROPERTY_NAME_CELL_PADDING = "cell-padding";
-const char* const PROPERTY_NAME_LAYOUT_ROWS = "layout-rows";
-const char* const PROPERTY_NAME_LAYOUT_COLUMNS = "layout-columns";
+const char* const PROPERTY_NAME_CELL_PADDING = "cellPadding";
+const char* const PROPERTY_NAME_LAYOUT_ROWS = "layoutRows";
+const char* const PROPERTY_NAME_LAYOUT_COLUMNS = "layoutColumns";
 const Vector2 CELL_SIZE( 10, 10 );
 
 static bool gObjectCreatedCallBackCalled;
 const Vector2 CELL_SIZE( 10, 10 );
 
 static bool gObjectCreatedCallBackCalled;
@@ -608,7 +608,7 @@ int UtcDaliTableViewSetGetProperty(void)
   DALI_TEST_CHECK( tableView.GetColumns() == 5u );
   DALI_TEST_CHECK( tableView.GetProperty(TableView::Property::COLUMNS).Get<int>() == 5 );
 
   DALI_TEST_CHECK( tableView.GetColumns() == 5u );
   DALI_TEST_CHECK( tableView.GetProperty(TableView::Property::COLUMNS).Get<int>() == 5 );
 
-  // Test "cell-padding" property
+  // Test "cellPadding" property
   DALI_TEST_CHECK( tableView.GetPropertyIndex( PROPERTY_NAME_CELL_PADDING ) == TableView::Property::CELL_PADDING );
 
   tableView.SetProperty( TableView::Property::CELL_PADDING, Size( 6.f, 8.f ) );
   DALI_TEST_CHECK( tableView.GetPropertyIndex( PROPERTY_NAME_CELL_PADDING ) == TableView::Property::CELL_PADDING );
 
   tableView.SetProperty( TableView::Property::CELL_PADDING, Size( 6.f, 8.f ) );
@@ -625,11 +625,11 @@ int UtcDaliTableViewSetGetProperty(void)
   item2[ "policy" ] = "relative";
   item2[ "value" ] = 0.2f;
 
   item2[ "policy" ] = "relative";
   item2[ "value" ] = 0.2f;
 
-  // Test "layout-rows" property
+  // Test "layoutRows" property
   DALI_TEST_CHECK( tableView.GetPropertyIndex(PROPERTY_NAME_LAYOUT_ROWS) == TableView::Property::LAYOUT_ROWS );
 
   /*
   DALI_TEST_CHECK( tableView.GetPropertyIndex(PROPERTY_NAME_LAYOUT_ROWS) == TableView::Property::LAYOUT_ROWS );
 
   /*
-   * "layout-rows":
+   * "layoutRows":
    *  {
    *    "1": { "policy": "fixed", "value": 30 },
    *    "3": { "policy": "relative", "value": 0.2 }
    *  {
    *    "1": { "policy": "fixed", "value": 30 },
    *    "3": { "policy": "relative", "value": 0.2 }
@@ -655,11 +655,11 @@ int UtcDaliTableViewSetGetProperty(void)
   DALI_TEST_CHECK( childMap->Find( "policy" )->Get<std::string>().compare("relative") == 0 );
   DALI_TEST_EQUALS( childMap->Find( "value" )->Get<float>(), 0.2f, TEST_LOCATION );
 
   DALI_TEST_CHECK( childMap->Find( "policy" )->Get<std::string>().compare("relative") == 0 );
   DALI_TEST_EQUALS( childMap->Find( "value" )->Get<float>(), 0.2f, TEST_LOCATION );
 
-  // Test "layout-columns" property
+  // Test "layoutColumns" property
   DALI_TEST_CHECK( tableView.GetPropertyIndex( PROPERTY_NAME_LAYOUT_COLUMNS ) == TableView::Property::LAYOUT_COLUMNS );
 
   /*
   DALI_TEST_CHECK( tableView.GetPropertyIndex( PROPERTY_NAME_LAYOUT_COLUMNS ) == TableView::Property::LAYOUT_COLUMNS );
 
   /*
-   * "layout-columns":
+   * "layoutColumns":
    *  {
    *    "2": { "policy": "relative", "value": 0.2 },
    *    "3": { "policy": "fixed", "value": 30 }
    *  {
    *    "2": { "policy": "relative", "value": 0.2 },
    *    "3": { "policy": "fixed", "value": 30 }
@@ -700,7 +700,7 @@ int UtcDaliTableViewCustomProperties(void)
 
   // Create a child actor with the custom properties
   Actor child1 = Actor::New();
 
   // Create a child actor with the custom properties
   Actor child1 = Actor::New();
-  child1.RegisterProperty( "cell-index", Vector2( 3, 4 ), Property::READ_WRITE );
+  child1.RegisterProperty( "cellIndex",  Vector2( 3, 4 ), Property::READ_WRITE );
   tableView.Add( child1 );
   // Check for actors at actual positions.
   DALI_TEST_CHECK( tableView.GetChildAt(TableView::CellPosition(3,4)) == child1);
   tableView.Add( child1 );
   // Check for actors at actual positions.
   DALI_TEST_CHECK( tableView.GetChildAt(TableView::CellPosition(3,4)) == child1);
@@ -709,9 +709,9 @@ int UtcDaliTableViewCustomProperties(void)
   Actor child2 = Actor::New();
   float rowSpan = 3.f;
   float columnSpan = 2.f;
   Actor child2 = Actor::New();
   float rowSpan = 3.f;
   float columnSpan = 2.f;
-  child2.RegisterProperty( "cell-index", Vector2( 6, 1 ), Property::READ_WRITE );
-  child2.RegisterProperty( "row-span", rowSpan, Property::READ_WRITE );
-  child2.RegisterProperty( "column-span", columnSpan, Property::READ_WRITE );
+  child2.RegisterProperty( "cellIndex",  Vector2( 6, 1 ), Property::READ_WRITE );
+  child2.RegisterProperty( "rowSpan",  rowSpan, Property::READ_WRITE );
+  child2.RegisterProperty( "columnSpan",  columnSpan, Property::READ_WRITE );
   tableView.Add( child2 );
   // Check for actors at actual positions.
   for( int i=0; i<rowSpan; i++ )
   tableView.Add( child2 );
   // Check for actors at actual positions.
   for( int i=0; i<rowSpan; i++ )
@@ -725,8 +725,8 @@ int UtcDaliTableViewCustomProperties(void)
   // Create a third child actor with the cell alignment properties
   Actor child3 = Actor::New();
   child3.SetSize( 5.f,5.f );
   // Create a third child actor with the cell alignment properties
   Actor child3 = Actor::New();
   child3.SetSize( 5.f,5.f );
-  child3.RegisterProperty( "cell-horizontal-alignment", "center", Property::READ_WRITE );
-  child3.RegisterProperty( "cell-vertical-alignment", "bottom", Property::READ_WRITE );
+  child3.RegisterProperty( "cellHorizontalAlignment",   "center", Property::READ_WRITE );
+  child3.RegisterProperty( "cellVerticalAlignment",   "bottom", Property::READ_WRITE );
   tableView.Add( child3 );
 
   // store the actor in the first available cell
   tableView.Add( child3 );
 
   // store the actor in the first available cell
index ef8f86d..becc47e 100644 (file)
@@ -40,40 +40,40 @@ void dali_textfield_cleanup(void)
 namespace
 {
 
 namespace
 {
 
-const char* const PROPERTY_NAME_RENDERING_BACKEND                    = "rendering-backend";
+const char* const PROPERTY_NAME_RENDERING_BACKEND                    = "renderingBackend";
 const char* const PROPERTY_NAME_TEXT                                 = "text";
 const char* const PROPERTY_NAME_TEXT                                 = "text";
-const char* const PROPERTY_NAME_PLACEHOLDER_TEXT                     = "placeholder-text";
-const char* const PROPERTY_NAME_PLACEHOLDER_TEXT_FOCUSED             = "placeholder-text-focused";
-const char* const PROPERTY_NAME_FONT_FAMILY                          = "font-family";
-const char* const PROPERTY_NAME_FONT_STYLE                           = "font-style";
-const char* const PROPERTY_NAME_POINT_SIZE                           = "point-size";
-const char* const PROPERTY_NAME_MAX_LENGTH                           = "max-length";
-const char* const PROPERTY_NAME_EXCEED_POLICY                        = "exceed-policy";
-const char* const PROPERTY_NAME_HORIZONTAL_ALIGNMENT                 = "horizontal-alignment";
-const char* const PROPERTY_NAME_VERTICAL_ALIGNMENT                   = "vertical-alignment";
-const char* const PROPERTY_NAME_TEXT_COLOR                           = "text-color";
-const char* const PROPERTY_NAME_PLACEHOLDER_TEXT_COLOR               = "placeholder-text-color";
-const char* const PROPERTY_NAME_SHADOW_OFFSET                        = "shadow-offset";
-const char* const PROPERTY_NAME_SHADOW_COLOR                         = "shadow-color";
-const char* const PROPERTY_NAME_PRIMARY_CURSOR_COLOR                 = "primary-cursor-color";
-const char* const PROPERTY_NAME_SECONDARY_CURSOR_COLOR               = "secondary-cursor-color";
-const char* const PROPERTY_NAME_ENABLE_CURSOR_BLINK                  = "enable-cursor-blink";
-const char* const PROPERTY_NAME_CURSOR_BLINK_INTERVAL                = "cursor-blink-interval";
-const char* const PROPERTY_NAME_CURSOR_BLINK_DURATION                = "cursor-blink-duration";
-const char* const PROPERTY_NAME_CURSOR_WIDTH                         = "cursor-width";
-const char* const PROPERTY_NAME_GRAB_HANDLE_IMAGE                    = "grab-handle-image";
-const char* const PROPERTY_NAME_GRAB_HANDLE_PRESSED_IMAGE            = "grab-handle-pressed-image";
-const char* const PROPERTY_NAME_SCROLL_THRESHOLD                     = "scroll-threshold";
-const char* const PROPERTY_NAME_SCROLL_SPEED                         = "scroll-speed";
-const char* const PROPERTY_NAME_SELECTION_HANDLE_IMAGE_LEFT          = "selection-handle-image-left";
-const char* const PROPERTY_NAME_SELECTION_HANDLE_IMAGE_RIGHT         = "selection-handle-image-right";
-const char* const PROPERTY_NAME_SELECTION_HANDLE_PRESSED_IMAGE_LEFT  = "selection-handle-pressed-image-left";
-const char* const PROPERTY_NAME_SELECTION_HANDLE_PRESSED_IMAGE_RIGHT = "selection-handle-pressed-image-right";
-const char* const PROPERTY_NAME_SELECTION_HANDLE_MARKER_IMAGE_LEFT   = "selection-handle-marker-image-left";
-const char* const PROPERTY_NAME_SELECTION_HANDLE_MARKER_IMAGE_RIGHT  = "selection-handle-marker-image-right";
-const char* const PROPERTY_NAME_SELECTION_HIGHLIGHT_COLOR            = "selection-highlight-color";
-const char* const PROPERTY_NAME_DECORATION_BOUNDING_BOX              = "decoration-bounding-box";
-const char* const PROPERTY_NAME_INPUT_METHOD_SETTINGS                = "input-method-settings";
+const char* const PROPERTY_NAME_PLACEHOLDER_TEXT                     = "placeholderText";
+const char* const PROPERTY_NAME_PLACEHOLDER_TEXT_FOCUSED             = "placeholderTextFocused";
+const char* const PROPERTY_NAME_FONT_FAMILY                          = "fontFamily";
+const char* const PROPERTY_NAME_FONT_STYLE                           = "fontStyle";
+const char* const PROPERTY_NAME_POINT_SIZE                           = "pointSize";
+const char* const PROPERTY_NAME_MAX_LENGTH                           = "maxLength";
+const char* const PROPERTY_NAME_EXCEED_POLICY                        = "exceedPolicy";
+const char* const PROPERTY_NAME_HORIZONTAL_ALIGNMENT                 = "horizontalAlignment";
+const char* const PROPERTY_NAME_VERTICAL_ALIGNMENT                   = "verticalAlignment";
+const char* const PROPERTY_NAME_TEXT_COLOR                           = "textColor";
+const char* const PROPERTY_NAME_PLACEHOLDER_TEXT_COLOR               = "placeholderTextColor";
+const char* const PROPERTY_NAME_SHADOW_OFFSET                        = "shadowOffset";
+const char* const PROPERTY_NAME_SHADOW_COLOR                         = "shadowColor";
+const char* const PROPERTY_NAME_PRIMARY_CURSOR_COLOR                 = "primaryCursorColor";
+const char* const PROPERTY_NAME_SECONDARY_CURSOR_COLOR               = "secondaryCursorColor";
+const char* const PROPERTY_NAME_ENABLE_CURSOR_BLINK                  = "enableCursorBlink";
+const char* const PROPERTY_NAME_CURSOR_BLINK_INTERVAL                = "cursorBlinkInterval";
+const char* const PROPERTY_NAME_CURSOR_BLINK_DURATION                = "cursorBlinkDuration";
+const char* const PROPERTY_NAME_CURSOR_WIDTH                         = "cursorWidth";
+const char* const PROPERTY_NAME_GRAB_HANDLE_IMAGE                    = "grabHandleImage";
+const char* const PROPERTY_NAME_GRAB_HANDLE_PRESSED_IMAGE            = "grabHandlePressedImage";
+const char* const PROPERTY_NAME_SCROLL_THRESHOLD                     = "scrollThreshold";
+const char* const PROPERTY_NAME_SCROLL_SPEED                         = "scrollSpeed";
+const char* const PROPERTY_NAME_SELECTION_HANDLE_IMAGE_LEFT          = "selectionHandleImageLeft";
+const char* const PROPERTY_NAME_SELECTION_HANDLE_IMAGE_RIGHT         = "selectionHandleImageRight";
+const char* const PROPERTY_NAME_SELECTION_HANDLE_PRESSED_IMAGE_LEFT  = "selectionHandlePressedImageLeft";
+const char* const PROPERTY_NAME_SELECTION_HANDLE_PRESSED_IMAGE_RIGHT = "selectionHandlePressedImageRight";
+const char* const PROPERTY_NAME_SELECTION_HANDLE_MARKER_IMAGE_LEFT   = "selectionHandleMarkerImageLeft";
+const char* const PROPERTY_NAME_SELECTION_HANDLE_MARKER_IMAGE_RIGHT  = "selectionHandleMarkerImageRight";
+const char* const PROPERTY_NAME_SELECTION_HIGHLIGHT_COLOR            = "selectionHighlightColor";
+const char* const PROPERTY_NAME_DECORATION_BOUNDING_BOX              = "decorationBoundingBox";
+const char* const PROPERTY_NAME_INPUT_METHOD_SETTINGS                = "inputMethodSettings";
 
 const int DEFAULT_RENDERING_BACKEND = Dali::Toolkit::Text::DEFAULT_RENDERING_BACKEND;
 
 
 const int DEFAULT_RENDERING_BACKEND = Dali::Toolkit::Text::DEFAULT_RENDERING_BACKEND;
 
@@ -422,7 +422,7 @@ int utcDaliTextFieldAtlasRenderP(void)
   END_TEST;
 }
 
   END_TEST;
 }
 
-// Positive test for the text-changed signal.
+// Positive test for the textChanged signal.
 int utcDaliTextFieldTextChangedP(void)
 {
   ToolkitTestApplication application;
 int utcDaliTextFieldTextChangedP(void)
 {
   ToolkitTestApplication application;
@@ -449,7 +449,7 @@ int utcDaliTextFieldTextChangedP(void)
   END_TEST;
 }
 
   END_TEST;
 }
 
-// Negative test for the text-changed signal.
+// Negative test for the textChanged signal.
 int utcDaliTextFieldTextChangedN(void)
 {
   ToolkitTestApplication application;
 int utcDaliTextFieldTextChangedN(void)
 {
   ToolkitTestApplication application;
index a44081d..2df3ed0 100644 (file)
@@ -36,20 +36,20 @@ void dali_textlabel_cleanup(void)
 namespace
 {
 
 namespace
 {
 
-const char* const PROPERTY_NAME_RENDERING_BACKEND = "rendering-backend";
+const char* const PROPERTY_NAME_RENDERING_BACKEND = "renderingBackend";
 const char* const PROPERTY_NAME_TEXT = "text";
 const char* const PROPERTY_NAME_TEXT = "text";
-const char* const PROPERTY_NAME_FONT_FAMILY = "font-family";
-const char* const PROPERTY_NAME_FONT_STYLE = "font-style";
-const char* const PROPERTY_NAME_POINT_SIZE = "point-size";
-const char* const PROPERTY_NAME_MULTI_LINE =  "multi-line";
-const char* const PROPERTY_NAME_HORIZONTAL_ALIGNMENT = "horizontal-alignment";
-const char* const PROPERTY_NAME_VERTICAL_ALIGNMENT = "vertical-alignment";
-const char* const PROPERTY_NAME_TEXT_COLOR = "text-color";
-const char* const PROPERTY_NAME_SHADOW_OFFSET = "shadow-offset";
-const char* const PROPERTY_NAME_SHADOW_COLOR = "shadow-color";
-const char* const PROPERTY_NAME_UNDERLINE_ENABLED = "underline-enabled";
-const char* const PROPERTY_NAME_UNDERLINE_COLOR = "underline-color";
-const char* const PROPERTY_NAME_UNDERLINE_HEIGHT = "underline-height";
+const char* const PROPERTY_NAME_FONT_FAMILY = "fontFamily";
+const char* const PROPERTY_NAME_FONT_STYLE = "fontStyle";
+const char* const PROPERTY_NAME_POINT_SIZE = "pointSize";
+const char* const PROPERTY_NAME_MULTI_LINE =  "multiLine";
+const char* const PROPERTY_NAME_HORIZONTAL_ALIGNMENT = "horizontalAlignment";
+const char* const PROPERTY_NAME_VERTICAL_ALIGNMENT = "verticalAlignment";
+const char* const PROPERTY_NAME_TEXT_COLOR = "textColor";
+const char* const PROPERTY_NAME_SHADOW_OFFSET = "shadowOffset";
+const char* const PROPERTY_NAME_SHADOW_COLOR = "shadowColor";
+const char* const PROPERTY_NAME_UNDERLINE_ENABLED = "underlineEnabled";
+const char* const PROPERTY_NAME_UNDERLINE_COLOR = "underlineColor";
+const char* const PROPERTY_NAME_UNDERLINE_HEIGHT = "underlineHeight";
 
 const int DEFAULT_RENDERING_BACKEND = Dali::Toolkit::Text::DEFAULT_RENDERING_BACKEND;
 
 
 const int DEFAULT_RENDERING_BACKEND = Dali::Toolkit::Text::DEFAULT_RENDERING_BACKEND;
 
index 703d54e..39fed86 100644 (file)
@@ -47,17 +47,17 @@ class Builder;
  *  {
  *    "templates": // are named instantiable actor trees
  *    {
  *  {
  *    "templates": // are named instantiable actor trees
  *    {
- *      "default-text":
+ *      "defaultText":
  *      {
  *        "type":"TextActor",
  *        "font":"",
  *      {
  *        "type":"TextActor",
  *        "font":"",
- *        "parent-origin":[0.5,0.5,0],
+ *        "parentOrigin":[0.5,0.5,0],
  *        "scale": [50,50,1]
  *      }
  *    },
  *    "styles": // are named property sets applied to actor trees
  *    {
  *        "scale": [50,50,1]
  *      }
  *    },
  *    "styles": // are named property sets applied to actor trees
  *    {
- *     "my-style":
+ *     "myStyle":
  *      {
  *        "size": [10,10,1] // root properties applied to a given root actor
  *        "actors":         // properties applied to actors found by name from root
  *      {
  *        "size": [10,10,1] // root properties applied to a given root actor
  *        "actors":         // properties applied to actors found by name from root
@@ -76,7 +76,7 @@ class Builder;
  *    "stage":
  *    [
  *      {
  *    "stage":
  *    [
  *      {
- *        "type":"default-text",
+ *        "type":"defaultText",
  *        "text":"Hello World",
  *        "position":[0,0,0]
  *      },
  *        "text":"Hello World",
  *        "position":[0,0,0]
  *      },
@@ -99,12 +99,12 @@ class Builder;
  *
  * - Create an actor tree from the "templates" section
  * @code
  *
  * - Create an actor tree from the "templates" section
  * @code
- * TextActor actor = TextActor::DownCast( builder.Create( "default-text" ) );
+ * TextActor actor = TextActor::DownCast( builder.Create( "defaultText" ) );
  * @endcode
  *
  * - Style an actor tree from the "styles" section
  * @code
  * @endcode
  *
  * - Style an actor tree from the "styles" section
  * @code
- * builder.ApplyStyle( "my-style", actor );
+ * builder.ApplyStyle( "myStyle",  actor );
  * @endcode
  *
  * - Create an actor tree from json
  * @endcode
  *
  * - Create an actor tree from json
@@ -253,7 +253,7 @@ class DALI_IMPORT_API Builder : public BaseHandle
    *
    * The animation is applied to a specific actor.
    * e.g.
    *
    * The animation is applied to a specific actor.
    * e.g.
-   *   Actor myInstance = builder.Create( "template-actor-tree" )
+   *   Actor myInstance = builder.Create( "templateActorTree" )
    *   Animation a = builder.CreateAnimation( "wobble", myInstance );
    *
    * @pre The Builder has been initialized.
    *   Animation a = builder.CreateAnimation( "wobble", myInstance );
    *
    * @pre The Builder has been initialized.
@@ -272,7 +272,7 @@ class DALI_IMPORT_API Builder : public BaseHandle
    * e.g.
    *   Property::Map map;
    *   map["ACTOR"] = actor.GetName();       // replaces '{ACTOR} in the template
    * e.g.
    *   Property::Map map;
    *   map["ACTOR"] = actor.GetName();       // replaces '{ACTOR} in the template
-   *   Actor myInstance = builder.Create( "template-actor-tree" )
+   *   Actor myInstance = builder.Create( "templateActorTree" )
    *   Animation a = builder.CreateAnimation( "wobble", myInstance);
    *
    * @pre The Builder has been initialized.
    *   Animation a = builder.CreateAnimation( "wobble", myInstance);
    *
    * @pre The Builder has been initialized.
@@ -290,7 +290,7 @@ class DALI_IMPORT_API Builder : public BaseHandle
    * @brief Creates an object (e.g. an actor) from the set of known style templates
    *
    * e.g.
    * @brief Creates an object (e.g. an actor) from the set of known style templates
    *
    * e.g.
-   *   mActor.Add( Actor::DownCast(builder.Create( "default-text")) );
+   *   mActor.Add( Actor::DownCast(builder.Create( "defaultText")) );
    *
    * @pre The Builder has been initialized.
    * @pre Preconditions have been met for creating dali objects ie Images, Actors etc
    *
    * @pre The Builder has been initialized.
    * @pre Preconditions have been met for creating dali objects ie Images, Actors etc
@@ -307,7 +307,7 @@ class DALI_IMPORT_API Builder : public BaseHandle
    * e.g.
    *   Property::Map map;
    *   map["IMAGE_DIR"] = "/usr/share/images"; // replaces '{IMAGE_DIR} in the template
    * e.g.
    *   Property::Map map;
    *   map["IMAGE_DIR"] = "/usr/share/images"; // replaces '{IMAGE_DIR} in the template
-   *   mActor.Add( Actor::DownCast(builder.Create( "default-image", map) ) );
+   *   mActor.Add( Actor::DownCast(builder.Create( "defaultImage",  map) ) );
    *
    * @pre The Builder has been initialized.
    * @pre Preconditions have been met for creating dali objects ie Images, Actors etc
    *
    * @pre The Builder has been initialized.
    * @pre Preconditions have been met for creating dali objects ie Images, Actors etc
@@ -413,7 +413,7 @@ class DALI_IMPORT_API Builder : public BaseHandle
   /**
    * Get or create a PathConstrainer from the set of known PathConstrainers
    * e.g.
   /**
    * Get or create a PathConstrainer from the set of known PathConstrainers
    * e.g.
-   *   PathConstrainer a = builder.GetPathConstrainer( "my-path-constrainer");
+   *   PathConstrainer a = builder.GetPathConstrainer( "myPathConstrainer");
    *
    * @pre The Builder has been initialized.
    * @pre The pathConstrainerName exists in the Constrainers section of the data representation
    *
    * @pre The Builder has been initialized.
    * @pre The pathConstrainerName exists in the Constrainers section of the data representation
@@ -425,7 +425,7 @@ class DALI_IMPORT_API Builder : public BaseHandle
   /**
    * Get or create a LinearConstrainer from the set of known LinearConstrainers
    * e.g.
   /**
    * Get or create a LinearConstrainer from the set of known LinearConstrainers
    * e.g.
-   *   LinearConstrainer a = builder.GetLinearConstrainer( "my-linear-constrainer");
+   *   LinearConstrainer a = builder.GetLinearConstrainer( "myLinearConstrainer");
    *
    * @pre The Builder has been initialized.
    * @pre The linearConstrainerName exists in the Constrainers section of the data representation
    *
    * @pre The Builder has been initialized.
    * @pre The linearConstrainerName exists in the Constrainers section of the data representation
index 181320d..e898326 100644 (file)
@@ -65,11 +65,11 @@ public:
     enum
     {
       // Event side properties
     enum
     {
       // Event side properties
-      FRAME_VISIBILITY = PROPERTY_START_INDEX,           ///< name "frame-visibility",      Whether a frame is visible or not,         type boolean
-      MAGNIFICATION_FACTOR,                              ///< name "magnification-factor",  Larger value means greater magnification,  type float
+      FRAME_VISIBILITY = PROPERTY_START_INDEX,           ///< name "frameVisibility",       Whether a frame is visible or not,         type boolean
+      MAGNIFICATION_FACTOR,                              ///< name "magnificationFactor",   Larger value means greater magnification,  type float
 
       // Animatable properties
 
       // Animatable properties
-      SOURCE_POSITION = ANIMATABLE_PROPERTY_START_INDEX, ///< name "source-position", The position of the source,  type Vector3
+      SOURCE_POSITION = ANIMATABLE_PROPERTY_START_INDEX, ///< name "sourcePosition",  The position of the source,  type Vector3
     };
   };
 
     };
   };
 
index 621eaec..4cd620b 100644 (file)
@@ -43,10 +43,10 @@ class ConfirmationPopup;
  * Please see the programming guide for a detailed description of the ConfirmationPopup including examples.
  *
  * Signals (these are dynamically created upon connect).
  * Please see the programming guide for a detailed description of the ConfirmationPopup including examples.
  *
  * Signals (these are dynamically created upon connect).
- * | %Signal Name          | Actor name to connect to | Property to set signal type (eg clicked) |
- * |-----------------------|--------------------------|------------------------------------------|
- * | control-signal-ok     | control-ok               | connect-signal-ok-selected               |
- * | control-signal-cancel | control-cancel           | connect-signal-cancel-selected           |
+ * | %Signal Name        | Actor name to connect to | Property to set signal type (eg clicked) |
+ * |---------------------|--------------------------|------------------------------------------|
+ * | controlSignalOk     | controlOk                | connectSignalOkSelected                  |
+ * | controlSignalCancel | controlCancel            | connectSignalCancelSelected              |
  */
 class DALI_IMPORT_API ConfirmationPopup : public Popup
 {
  */
 class DALI_IMPORT_API ConfirmationPopup : public Popup
 {
@@ -68,8 +68,8 @@ public:
   {
     enum
     {
   {
     enum
     {
-      CONNECT_SIGNAL_OK_SELECTED = PROPERTY_START_INDEX, ///< name "connect-signal-ok-selected",     type std::string
-      CONNECT_SIGNAL_CANCEL_SELECTED                     ///< name "connect-signal-cancel-selected", type std::string
+      CONNECT_SIGNAL_OK_SELECTED = PROPERTY_START_INDEX, ///< name "connectSignalOkSelected",        type std::string
+      CONNECT_SIGNAL_CANCEL_SELECTED                     ///< name "connectSignalCancelSelected",    type std::string
     };
   };
 
     };
   };
 
index 40b4df3..b0bf93d 100644 (file)
@@ -46,7 +46,7 @@ class Popup;
  * Signals
  * | %Signal Name      | Method                       |
  * |-------------------|------------------------------|
  * Signals
  * | %Signal Name      | Method                       |
  * |-------------------|------------------------------|
- * | touched-outside   | @ref OutsideTouchedSignal()  |
+ * | touchedOutside    | @ref OutsideTouchedSignal()  |
  * | showing           | @ref ShowingSignal()         |
  * | shown             | @ref ShownSignal()           |
  * | hiding            | @ref HidingSignal()          |
  * | showing           | @ref ShowingSignal()         |
  * | shown             | @ref ShownSignal()           |
  * | hiding            | @ref HidingSignal()          |
@@ -76,23 +76,23 @@ public:
       TITLE = PROPERTY_START_INDEX, ///< name "title",                  type Property::Map
       CONTENT,                      ///< name "content",                type Property::Map
       FOOTER,                       ///< name "footer",                 type Property::Map
       TITLE = PROPERTY_START_INDEX, ///< name "title",                  type Property::Map
       CONTENT,                      ///< name "content",                type Property::Map
       FOOTER,                       ///< name "footer",                 type Property::Map
-      DISPLAY_STATE,                ///< name "display-state",          type std::string
-      TOUCH_TRANSPARENT,            ///< name "touch-transparent",      type bool
-      TAIL_VISIBILITY,              ///< name "tail-visibility",        type bool
-      TAIL_POSITION,                ///< name "tail-position",          type Vector3
-      CONTEXTUAL_MODE,              ///< name "contextual-mode",        type std::string
-      ANIMATION_DURATION,           ///< name "animation-duration",     type float
-      ANIMATION_MODE,               ///< name "animation-mode",         type std::string
-      ENTRY_ANIMATION,              ///< name "entry-animation",        type Property::Map
-      EXIT_ANIMATION,               ///< name "exit-animation",         type Property::Map
-      AUTO_HIDE_DELAY,              ///< name "auto-hide-delay",        type int
-      BACKING_ENABLED,              ///< name "backing-enabled",        type bool
-      BACKING_COLOR,                ///< name "backing-color",          type Vector4
-      POPUP_BACKGROUND_IMAGE,       ///< name "popup-background-image", type std::string
-      TAIL_UP_IMAGE,                ///< name "tail-up-image",          type std::string
-      TAIL_DOWN_IMAGE,              ///< name "tail-down-image",        type std::string
-      TAIL_LEFT_IMAGE,              ///< name "tail-left-image",        type std::string
-      TAIL_RIGHT_IMAGE,             ///< name "tail-right-image",       type std::string
+      DISPLAY_STATE,                ///< name "displayState",           type std::string
+      TOUCH_TRANSPARENT,            ///< name "touchTransparent",       type bool
+      TAIL_VISIBILITY,              ///< name "tailVisibility",         type bool
+      TAIL_POSITION,                ///< name "tailPosition",           type Vector3
+      CONTEXTUAL_MODE,              ///< name "contextualMode",         type std::string
+      ANIMATION_DURATION,           ///< name "animationDuration",      type float
+      ANIMATION_MODE,               ///< name "animationMode",          type std::string
+      ENTRY_ANIMATION,              ///< name "entryAnimation",         type Property::Map
+      EXIT_ANIMATION,               ///< name "exitAnimation",          type Property::Map
+      AUTO_HIDE_DELAY,              ///< name "autoHideDelay",          type int
+      BACKING_ENABLED,              ///< name "backingEnabled",         type bool
+      BACKING_COLOR,                ///< name "backingColor",           type Vector4
+      POPUP_BACKGROUND_IMAGE,       ///< name "popupBackgroundImage",   type std::string
+      TAIL_UP_IMAGE,                ///< name "tailUpImage",            type std::string
+      TAIL_DOWN_IMAGE,              ///< name "tailDownImage",          type std::string
+      TAIL_LEFT_IMAGE,              ///< name "tailLeftImage",          type std::string
+      TAIL_RIGHT_IMAGE,             ///< name "tailRightImage",         type std::string
     };
   };
 
     };
   };
 
index 2e0c6c9..6d7a4b8 100644 (file)
@@ -41,9 +41,9 @@ class RendererFactory;
  *
  * The renderer type is required in the property map for requesting a control renderer.
  *
  *
  * The renderer type is required in the property map for requesting a control renderer.
  *
- * | %Property Name            | Type             |
- * |---------------------------|------------------|
- * | renderer-type             | STRING           |
+ * | %Property Name           | Type             |
+ * |--------------------------|------------------|
+ * | rendererType             | STRING           |
  */
 class DALI_IMPORT_API RendererFactory : public BaseHandle
 {
  */
 class DALI_IMPORT_API RendererFactory : public BaseHandle
 {
index 6981a69..2773be4 100644 (file)
@@ -38,7 +38,7 @@ class Slider;
  * Signals
  * | %Signal Name      | Method                      |
  * |-------------------|-----------------------------|
  * Signals
  * | %Signal Name      | Method                      |
  * |-------------------|-----------------------------|
- * | value-changed     | @ref ValueChangedSignal()   |
+ * | valueChanged      | @ref ValueChangedSignal()   |
  * | mark              | @ref MarkSignal()           |
  */
 class DALI_IMPORT_API Slider : public Control
  * | mark              | @ref MarkSignal()           |
  */
 class DALI_IMPORT_API Slider : public Control
@@ -61,26 +61,26 @@ public:
   {
     enum
     {
   {
     enum
     {
-      LOWER_BOUND = PROPERTY_START_INDEX, ///< Property, name "lower-bound",            type float
-      UPPER_BOUND,                        ///< Property, name "upper-bound",            type float
+      LOWER_BOUND = PROPERTY_START_INDEX, ///< Property, name "lowerBound",             type float
+      UPPER_BOUND,                        ///< Property, name "upperBound",             type float
       VALUE,                              ///< Property, name "value",                  type float
       VALUE,                              ///< Property, name "value",                  type float
-      HIT_REGION,                         ///< Property, name "hit-region",             type Vector2
-      BACKING_REGION,                     ///< Property, name "backing-region",         type Vector2
-      HANDLE_REGION,                      ///< Property, name "handle-region",          type Vector2
-      BACKING_IMAGE_NAME,                 ///< Property, name "backing-image-name",     type std::string
-      HANDLE_IMAGE_NAME,                  ///< Property, name "handle-image-name",      type std::string
-      PROGRESS_IMAGE_NAME,                ///< Property, name "progress-image-name",    type std::string
-      POPUP_IMAGE_NAME,                   ///< Property, name "popup-image-name",       type std::string
-      POPUP_ARROW_IMAGE_NAME,             ///< Property, name "popup-arrow-image-name", type std::string
-      DISABLE_COLOR,                      ///< Property, name "disable-color",          type Vector4
-      POPUP_TEXT_COLOR,                   ///< Property, name "popup-text-color",       type Vector4
-      VALUE_PRECISION,                    ///< Property, name "value-precision",        type int
-      SHOW_POPUP,                         ///< Property, name "show-popup",             type bool
-      SHOW_VALUE,                         ///< Property, name "show-value",             type bool
+      HIT_REGION,                         ///< Property, name "hitRegion",              type Vector2
+      BACKING_REGION,                     ///< Property, name "backingRegion",          type Vector2
+      HANDLE_REGION,                      ///< Property, name "handleRegion",           type Vector2
+      BACKING_IMAGE_NAME,                 ///< Property, name "backingImageName",       type std::string
+      HANDLE_IMAGE_NAME,                  ///< Property, name "handleImageName",        type std::string
+      PROGRESS_IMAGE_NAME,                ///< Property, name "progressImageName",      type std::string
+      POPUP_IMAGE_NAME,                   ///< Property, name "popupImageName",         type std::string
+      POPUP_ARROW_IMAGE_NAME,             ///< Property, name "popupArrowImageName",    type std::string
+      DISABLE_COLOR,                      ///< Property, name "disableColor",           type Vector4
+      POPUP_TEXT_COLOR,                   ///< Property, name "popupTextColor",         type Vector4
+      VALUE_PRECISION,                    ///< Property, name "valuePrecision",         type int
+      SHOW_POPUP,                         ///< Property, name "showPopup",              type bool
+      SHOW_VALUE,                         ///< Property, name "showValue",              type bool
       ENABLED,                            ///< Property, name "enabled",                type bool
       MARKS,                              ///< Property, name "marks",                  type Property::Array<float>
       ENABLED,                            ///< Property, name "enabled",                type bool
       MARKS,                              ///< Property, name "marks",                  type Property::Array<float>
-      SNAP_TO_MARKS,                      ///< Property, name "snap-to-marks",          type bool
-      MARK_TOLERANCE,                     ///< Property, name "mark-tolerance",         type float
+      SNAP_TO_MARKS,                      ///< Property, name "snapToMarks",            type bool
+      MARK_TOLERANCE,                     ///< Property, name "markTolerance",          type float
     };
   };
 
     };
   };
 
index 4eec4c1..5201c08 100644 (file)
@@ -75,23 +75,23 @@ public:
   {
     enum
     {
   {
     enum
     {
-      POPUP_MAX_SIZE =  PROPERTY_START_INDEX,   ///< name "popup-max-size",                maximum size the Popup can be,                  type VECTOR2
-      POPUP_MIN_SIZE,                           ///< name "popup-min-size",                minimum size the Popup can be,                  type VECTOR2
-      OPTION_MAX_SIZE,                          ///< name "option-max-size",               maximum size an option can be,                  type VECTOR2
-      OPTION_MIN_SIZE,                          ///< name "option-min-size",               minimum size an option can be,                  type VECTOR2
-      OPTION_DIVIDER_SIZE,                      ///< name "option-divider-size",           size of the divider between options             type VECTOR2
-      POPUP_CLIPBOARD_BUTTON_ICON_IMAGE,        ///< name "popup-clipboard-button-image",  The image to use as the popup clipboard icon,   type STRING
-      POPUP_CUT_BUTTON_ICON_IMAGE,              ///< name "popup-cut-button-image",        The image to use as the popup cut icon,         type STRING
-      POPUP_COPY_BUTTON_ICON_IMAGE,             ///< name "popup-copy-button-image",       The image to use as the popup copy icon,        type STRING
-      POPUP_PASTE_BUTTON_ICON_IMAGE,            ///< name "popup-paste-button-image",      The image to use as the popup paste icon,       type STRING
-      POPUP_SELECT_BUTTON_ICON_IMAGE,           ///< name "popup-select-button-image",     The image to use as the popup select icon,      type STRING
-      POPUP_SELECT_ALL_BUTTON_ICON_IMAGE,       ///< name "popup-select-all-button-image", The image to use as the popup select all icon,  type STRING
-      POPUP_DIVIDER_COLOR,                      ///< name "popup-divider-color",           The color of the divider between options,       type VECTOR4
-      POPUP_ICON_COLOR,                         ///< name "popup-icon-color",              The color of the icons (if supplied),           type VECTOR4
-      POPUP_PRESSED_COLOR,                      ///< name "popup-pressed-color",           The color of the option when pressed,           type VECTOR4
-      POPUP_PRESSED_IMAGE,                      ///< name "popup-pressed-image",           The image to use for the option when pressed,   type STRING
-      POPUP_FADE_IN_DURATION,                   ///< name "popup-fade-in-duration",        The duration of the fade-in animation,          type FLOAT
-      POPUP_FADE_OUT_DURATION,                  ///< name "popup-fade-out-duration",       The duration of the fade-out animation,         type FLOAT
+      POPUP_MAX_SIZE =  PROPERTY_START_INDEX,   ///< name "popupMaxSize",                  maximum size the Popup can be,                  type VECTOR2
+      POPUP_MIN_SIZE,                           ///< name "popupMinSize",                  minimum size the Popup can be,                  type VECTOR2
+      OPTION_MAX_SIZE,                          ///< name "optionMaxSize",                 maximum size an option can be,                  type VECTOR2
+      OPTION_MIN_SIZE,                          ///< name "optionMinSize",                 minimum size an option can be,                  type VECTOR2
+      OPTION_DIVIDER_SIZE,                      ///< name "optionDividerSize",             size of the divider between options             type VECTOR2
+      POPUP_CLIPBOARD_BUTTON_ICON_IMAGE,        ///< name "popupClipboardButtonImage",     The image to use as the popup clipboard icon,   type STRING
+      POPUP_CUT_BUTTON_ICON_IMAGE,              ///< name "popupCutButtonImage",           The image to use as the popup cut icon,         type STRING
+      POPUP_COPY_BUTTON_ICON_IMAGE,             ///< name "popupCopyButtonImage",          The image to use as the popup copy icon,        type STRING
+      POPUP_PASTE_BUTTON_ICON_IMAGE,            ///< name "popupPasteButtonImage",         The image to use as the popup paste icon,       type STRING
+      POPUP_SELECT_BUTTON_ICON_IMAGE,           ///< name "popupSelectButtonImage",        The image to use as the popup select icon,      type STRING
+      POPUP_SELECT_ALL_BUTTON_ICON_IMAGE,       ///< name "popupSelectAllButtonImage",     The image to use as the popup select all icon,  type STRING
+      POPUP_DIVIDER_COLOR,                      ///< name "popupDividerColor",             The color of the divider between options,       type VECTOR4
+      POPUP_ICON_COLOR,                         ///< name "popupIconColor",                The color of the icons (if supplied),           type VECTOR4
+      POPUP_PRESSED_COLOR,                      ///< name "popupPressedColor",             The color of the option when pressed,           type VECTOR4
+      POPUP_PRESSED_IMAGE,                      ///< name "popupPressedImage",             The image to use for the option when pressed,   type STRING
+      POPUP_FADE_IN_DURATION,                   ///< name "popupFadeInDuration",           The duration of the fade-in animation,          type FLOAT
+      POPUP_FADE_OUT_DURATION,                  ///< name "popupFadeOutDuration",          The duration of the fade-out animation,         type FLOAT
     };
   };
 
     };
   };
 
index 1e48c56..0a3b941 100644 (file)
@@ -62,9 +62,9 @@ public:
   {
     enum
     {
   {
     enum
     {
-      MAX_SIZE =  PROPERTY_START_INDEX, ///< name "max-size",                The maximum size the Popup can be,              type VECTOR2
-      ENABLE_OVERSHOOT,                 ///< name "enable-overshoot",        Whether the overshoot image is enabled,         type BOOLEAN
-      SCROLL_VIEW,                      ///< name "scroll-view",             Properties to set on scroll view                type Property::Map
+      MAX_SIZE =  PROPERTY_START_INDEX, ///< name "maxSize",                 The maximum size the Popup can be,              type VECTOR2
+      ENABLE_OVERSHOOT,                 ///< name "enableOvershoot",         Whether the overshoot image is enabled,         type BOOLEAN
+      SCROLL_VIEW,                      ///< name "scrollView",              Properties to set on scroll view                type Property::Map
     };
   };
 
     };
   };
 
index 6240350..330f0be 100644 (file)
@@ -41,10 +41,10 @@ class KeyInputFocusManager;
  * UnhandledKeyEventSignal() is emitted.
  *
  * Signals
  * UnhandledKeyEventSignal() is emitted.
  *
  * Signals
- * | %Signal Name            | Method                            |
- * |-------------------------|-----------------------------------|
- * | key-input-focus-changed | @ref KeyInputFocusChangedSignal() |
- * | unhandled-key-event     | @ref UnhandledKeyEventSignal()    |
+ * | %Signal Name         | Method                            |
+ * |----------------------|-----------------------------------|
+ * | keyInputFocusChanged | @ref KeyInputFocusChangedSignal() |
+ * | unhandledKeyEvent    | @ref UnhandledKeyEventSignal()    |
  */
 class DALI_IMPORT_API KeyInputFocusManager : public BaseHandle
 {
  */
 class DALI_IMPORT_API KeyInputFocusManager : public BaseHandle
 {
index e160532..f97f4f4 100644 (file)
@@ -245,13 +245,13 @@ inline Property::Map CreateDissolveEffect( bool useHighPrecision = true )
   vertexShaderString.append( vertexShader );
   fragmentShaderString.append( fragmentShader );
 
   vertexShaderString.append( vertexShader );
   fragmentShaderString.append( fragmentShader );
 
-  customShader[ "vertex-shader" ] = vertexShaderString;
-  customShader[ "fragment-shader" ] = fragmentShaderString;
+  customShader[ "vertexShader" ] = vertexShaderString;
+  customShader[ "fragmentShader" ] = fragmentShaderString;
 
 
-  customShader[ "subdivide-grid-x" ] = 20;
-  customShader[ "subdivide-grid-y" ] = 20;
+  customShader[ "subdivideGridX" ] = 20;
+  customShader[ "subdivideGridY" ] = 20;
 
 
-  customShader[ "hints" ] = "output-is-transparent";
+  customShader[ "hints" ] = "outputIsTransparent";
 
   map[ "shader" ] = customShader;
   return map;
 
   map[ "shader" ] = customShader;
   return map;
index aaeb537..d495030 100644 (file)
@@ -165,8 +165,8 @@ inline Dali::Property::Map CreateDistanceFieldEffect()
   fragmentShaderString.append( fragmentShaderPrefix );
   fragmentShaderString.append( fragmentShader );
 
   fragmentShaderString.append( fragmentShaderPrefix );
   fragmentShaderString.append( fragmentShader );
 
-  customShader[ "fragment-shader" ] = fragmentShaderString;
-  customShader[ "hints" ] = "output-is-transparent";
+  customShader[ "fragmentShader" ] = fragmentShaderString;
+  customShader[ "hints" ] = "outputIsTransparent";
 
   map[ "shader" ] = customShader;
   return map;
 
   map[ "shader" ] = customShader;
   return map;
index aede5f1..2151444 100644 (file)
@@ -223,14 +223,14 @@ inline Property::Map CreateMotionBlurEffect()
   Property::Map map;
 
   Property::Map customShader;
   Property::Map map;
 
   Property::Map customShader;
-  customShader[ "vertex-shader" ] = vertexSource;
-  customShader[ "fragment-shader" ] = fragmentSource;
+  customShader[ "vertexShader" ] = vertexSource;
+  customShader[ "fragmentShader" ] = fragmentSource;
 
 
-  customShader[ "subdivide-grid-x" ] = 10;
-  customShader[ "subdivide-grid-y" ] = 10;
+  customShader[ "subdivideGridX" ] = 10;
+  customShader[ "subdivideGridY" ] = 10;
 
   // NOTE: we must turn on alpha blending for the actor (HINT_BLENDING)
 
   // NOTE: we must turn on alpha blending for the actor (HINT_BLENDING)
-  customShader[ "hints" ] = "output-is-transparent";
+  customShader[ "hints" ] = "outputIsTransparent";
 
   map[ "shader" ] = customShader;
   return map;
 
   map[ "shader" ] = customShader;
   return map;
index 5e43953..332fa48 100644 (file)
@@ -188,14 +188,14 @@ inline Property::Map CreateMotionStretchEffect()
   Property::Map map;
 
   Property::Map customShader;
   Property::Map map;
 
   Property::Map customShader;
-  customShader[ "vertex-shader" ] = vertexSource;
-  customShader[ "fragment-shader" ] = fragmentSource;
+  customShader[ "vertexShader" ] = vertexSource;
+  customShader[ "fragmentShader" ] = fragmentSource;
 
 
-  customShader[ "subdivide-grid-x" ] = 10;
-  customShader[ "subdivide-grid-y" ] = 10;
+  customShader[ "subdivideGridX" ] = 10;
+  customShader[ "subdivideGridY" ] = 10;
 
   // NOTE: we must turn on alpha blending for the actor (HINT_BLENDING)
 
   // NOTE: we must turn on alpha blending for the actor (HINT_BLENDING)
-  customShader[ "hints" ] = "output-is-transparent";
+  customShader[ "hints" ] = "outputIsTransparent";
 
   map[ "shader" ] = customShader;
   return map;
 
   map[ "shader" ] = customShader;
   return map;
index a1596e1..8c9f3b5 100644 (file)
@@ -138,7 +138,7 @@ public:
   /**
    * @brief Set a constant for use when building styles
    *
   /**
    * @brief Set a constant for use when building styles
    *
-   * A constant is used in JSON files e.g. "my-image":"{ROOT_PATH}/mypath/image.jpg"
+   * A constant is used in JSON files e.g. "myImage":"{ROOT_PATH}/mypath/image.jpg"
    * where the string "{ROOT_PATH}" is substituted with the value.
    *
    * @param[in] key The key of the constant
    * where the string "{ROOT_PATH}" is substituted with the value.
    *
    * @param[in] key The key of the constant
index 7b915a6..9c30573 100644 (file)
@@ -74,9 +74,9 @@ class CubeTransitionEffect;
  * @endcode
  *
  * Signals
  * @endcode
  *
  * Signals
- * | %Signal Name         | Method                           |
- * |----------------------|----------------------------------|
- * | transition-completed | @ref TransitionCompletedSignal() |
+ * | %Signal Name        | Method                           |
+ * |---------------------|----------------------------------|
+ * | transitionCompleted | @ref TransitionCompletedSignal() |
  */
 class DALI_IMPORT_API CubeTransitionEffect : public Control
 {
  */
 class DALI_IMPORT_API CubeTransitionEffect : public Control
 {
index 935e09f..3e14751 100644 (file)
@@ -46,16 +46,16 @@ namespace // unnamed namespace
 
 // Signals
 
 
 // Signals
 
-const char* const SIGNAL_FOCUS_CHANGED =           "focus-changed";
-const char* const SIGNAL_FOCUS_OVERSHOT =          "focus-overshot";
-const char* const SIGNAL_FOCUSED_ACTOR_ACTIVATED = "focused-actor-activated";
+const char* const SIGNAL_FOCUS_CHANGED =           "focusChanged";
+const char* const SIGNAL_FOCUS_OVERSHOT =          "focusOvershot";
+const char* const SIGNAL_FOCUSED_ACTOR_ACTIVATED = "focusedActorActivated";
 
 #if defined(DEBUG_ENABLED)
 Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_FOCUS_MANAGER");
 #endif
 
 const char* const ACTOR_FOCUSABLE("focusable");
 
 #if defined(DEBUG_ENABLED)
 Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_FOCUS_MANAGER");
 #endif
 
 const char* const ACTOR_FOCUSABLE("focusable");
-const char* const IS_FOCUS_GROUP("is-focus-group");
+const char* const IS_FOCUS_GROUP("isFocusGroup");
 
 const char* FOCUS_BORDER_IMAGE_PATH = DALI_IMAGE_DIR "B16-8_TTS_focus.png";
 const Vector4 FOCUS_BORDER_IMAGE_BORDER = Vector4(7.0f, 7.0f, 7.0f, 7.0f);
 
 const char* FOCUS_BORDER_IMAGE_PATH = DALI_IMAGE_DIR "B16-8_TTS_focus.png";
 const Vector4 FOCUS_BORDER_IMAGE_BORDER = Vector4(7.0f, 7.0f, 7.0f, 7.0f);
index fbe8c33..d04e7e8 100644 (file)
@@ -47,32 +47,32 @@ Actor SetupActor( const TreeNode& child, Actor& actor, const Replacement& consta
   // we allow enums strings for parent-origin and anchor-point but as with the current json
   // strings always succeed if they exist then check its not vector. If they are Vec3s then
   // this has already been set as a generic property.
   // we allow enums strings for parent-origin and anchor-point but as with the current json
   // strings always succeed if they exist then check its not vector. If they are Vec3s then
   // this has already been set as a generic property.
-  if( !IsVector3( child, "parent-origin") )
+  if( !IsVector3( child, "parentOrigin") )
   {
   {
-    if( OptionalVector3 v = constant.IsVector3( IsChild(child, "parent-origin") ) )
+    if( OptionalVector3 v = constant.IsVector3( IsChild(child, "parentOrigin") ) )
     {
       actor.SetParentOrigin( *v );
     }
     {
       actor.SetParentOrigin( *v );
     }
-    else if( OptionalString origin = constant.IsString( IsChild(child, "parent-origin") ) )
+    else if( OptionalString origin = constant.IsString( IsChild(child, "parentOrigin") ) )
     {
       actor.SetParentOrigin( GetAnchorConstant(*origin) );
     }
   }
 
     {
       actor.SetParentOrigin( GetAnchorConstant(*origin) );
     }
   }
 
-  if( !IsVector3(child, "anchor-point") )
+  if( !IsVector3(child, "anchorPoint") )
   {
   {
-    if( OptionalVector3 v = constant.IsVector3( IsChild(child, "anchor-point") ) )
+    if( OptionalVector3 v = constant.IsVector3( IsChild(child, "anchorPoint") ) )
     {
       actor.SetAnchorPoint( *v );
     }
     {
       actor.SetAnchorPoint( *v );
     }
-    else if( OptionalString anchor = constant.IsString( IsChild(child, "anchor-point") ) )
+    else if( OptionalString anchor = constant.IsString( IsChild(child, "anchorPoint") ) )
     {
       actor.SetAnchorPoint( GetAnchorConstant(*anchor) );
     }
   }
 
   // Add custom properties
     {
       actor.SetAnchorPoint( GetAnchorConstant(*anchor) );
     }
   }
 
   // Add custom properties
-  if( OptionalChild customPropertiesChild = IsChild(child,  "custom-properties") )
+  if( OptionalChild customPropertiesChild = IsChild(child,  "customProperties") )
   {
     const TreeNode& customPropertiesNode = *customPropertiesChild;
     const TreeConstIter endIter = customPropertiesNode.CEnd();
   {
     const TreeNode& customPropertiesNode = *customPropertiesChild;
     const TreeConstIter endIter = customPropertiesNode.CEnd();
index ddf2cda..980fc90 100644 (file)
@@ -159,7 +159,7 @@ Animation CreateAnimation( const TreeNode& child, const Replacement& constant, D
 
   Animation animation( Animation::New( 0.f ) );
 
 
   Animation animation( Animation::New( 0.f ) );
 
-  // duration needs to be set before AnimateTo calls for correct operation when AnimateTo has no "time-period".
+  // duration needs to be set before AnimateTo calls for correct operation when AnimateTo has no "timePeriod".
   OptionalFloat duration = constant.IsFloat( IsChild(child, "duration" ) );
 
   if( duration )
   OptionalFloat duration = constant.IsFloat( IsChild(child, "duration" ) );
 
   if( duration )
@@ -172,7 +172,7 @@ Animation CreateAnimation( const TreeNode& child, const Replacement& constant, D
     animation.SetLooping( *looping );
   }
 
     animation.SetLooping( *looping );
   }
 
-  if( OptionalString endAction = constant.IsString(  IsChild(child, "end-action" ) ) )
+  if( OptionalString endAction = constant.IsString(  IsChild(child, "endAction" ) ) )
   {
     if("BAKE" == *endAction)
     {
   {
     if("BAKE" == *endAction)
     {
@@ -188,7 +188,7 @@ Animation CreateAnimation( const TreeNode& child, const Replacement& constant, D
     }
   }
 
     }
   }
 
-  if( OptionalString endAction = constant.IsString(  IsChild(child, "disconnect-action" ) ) )
+  if( OptionalString endAction = constant.IsString(  IsChild(child, "disconnectAction" ) ) )
   {
     if("BAKE" == *endAction)
     {
   {
     if("BAKE" == *endAction)
     {
@@ -267,7 +267,7 @@ Animation CreateAnimation( const TreeNode& child, const Replacement& constant, D
       AlphaFunction alphaFunction( AlphaFunction::DEFAULT );
       TimePeriod timePeriod( 0.f );
 
       AlphaFunction alphaFunction( AlphaFunction::DEFAULT );
       TimePeriod timePeriod( 0.f );
 
-      OptionalChild timeChild = IsChild( pKeyChild.second, "time-period" );
+      OptionalChild timeChild = IsChild( pKeyChild.second, "timePeriod" );
 
       if( timeChild )
       {
 
       if( timeChild )
       {
@@ -276,12 +276,12 @@ Animation CreateAnimation( const TreeNode& child, const Replacement& constant, D
 
       durationSum = std::max( durationSum, timePeriod.delaySeconds + timePeriod.durationSeconds );
 
 
       durationSum = std::max( durationSum, timePeriod.delaySeconds + timePeriod.durationSeconds );
 
-      if( OptionalString alphaChild = constant.IsString( IsChild(pKeyChild.second, "alpha-function" ) ) )
+      if( OptionalString alphaChild = constant.IsString( IsChild(pKeyChild.second, "alphaFunction" ) ) )
       {
         alphaFunction = GetAlphaFunction( *alphaChild );
       }
 
       {
         alphaFunction = GetAlphaFunction( *alphaChild );
       }
 
-      if( OptionalChild keyFrameChild = IsChild(pKeyChild.second, "key-frames") )
+      if( OptionalChild keyFrameChild = IsChild(pKeyChild.second, "keyFrames") )
       {
         DALI_ASSERT_ALWAYS( property  && "Animation must specify a property name" );
         Property prop = Property( targetHandle, propIndex );
       {
         DALI_ASSERT_ALWAYS( property  && "Animation must specify a property name" );
         Property prop = Property( targetHandle, propIndex );
@@ -313,7 +313,7 @@ Animation CreateAnimation( const TreeNode& child, const Replacement& constant, D
           }
 
           AlphaFunction kfAlphaFunction( AlphaFunction::DEFAULT );
           }
 
           AlphaFunction kfAlphaFunction( AlphaFunction::DEFAULT );
-          if( OptionalString alphaFuncStr = constant.IsString( IsChild(pKeyChild.second, "alpha-function") ) )
+          if( OptionalString alphaFuncStr = constant.IsString( IsChild(pKeyChild.second, "alphaFunction") ) )
           {
             kfAlphaFunction = GetAlphaFunction( *alphaFuncStr );
           }
           {
             kfAlphaFunction = GetAlphaFunction( *alphaFuncStr );
           }
index 11b92f6..1535eeb 100644 (file)
@@ -301,7 +301,7 @@ void Builder::SetProperties( const TreeNode& node, Handle& handle, const Replace
         if( !SetPropertyFromNode( keyChild.second, type, value, constant ) )
         {
           // verbose as this might not be a problem
         if( !SetPropertyFromNode( keyChild.second, type, value, constant ) )
         {
           // verbose as this might not be a problem
-          // eg parent-origin can be a string which is picked up later
+          // eg parentOrigin can be a string which is picked up later
           DALI_SCRIPT_VERBOSE("Could not convert property:%s\n", key.c_str());
         }
         else
           DALI_SCRIPT_VERBOSE("Could not convert property:%s\n", key.c_str());
         }
         else
@@ -547,7 +547,7 @@ void Builder::SetupTask( RenderTask& task, const TreeNode& node, const Replaceme
   const Stage& stage = Stage::GetCurrent();
   Layer root  = stage.GetRootLayer();
 
   const Stage& stage = Stage::GetCurrent();
   Layer root  = stage.GetRootLayer();
 
-  if( OptionalString s = constant.IsString( IsChild(node, "source-actor") ) )
+  if( OptionalString s = constant.IsString( IsChild(node, "sourceActor") ) )
   {
     Actor actor = root.FindChildByName(*s);
     if(actor)
   {
     Actor actor = root.FindChildByName(*s);
     if(actor)
@@ -560,7 +560,7 @@ void Builder::SetupTask( RenderTask& task, const TreeNode& node, const Replaceme
     }
   }
 
     }
   }
 
-  if( OptionalString s = constant.IsString( IsChild(node, "camera-actor") ) )
+  if( OptionalString s = constant.IsString( IsChild(node, "cameraActor") ) )
   {
     CameraActor actor = CameraActor::DownCast( root.FindChildByName(*s) );
     if(actor)
   {
     CameraActor actor = CameraActor::DownCast( root.FindChildByName(*s) );
     if(actor)
@@ -573,7 +573,7 @@ void Builder::SetupTask( RenderTask& task, const TreeNode& node, const Replaceme
     }
   }
 
     }
   }
 
-  if( OptionalString s = constant.IsString( IsChild(node, "target-frame-buffer") ) )
+  if( OptionalString s = constant.IsString( IsChild(node, "targetFrameBuffer") ) )
   {
     FrameBufferImage fb = GetFrameBufferImage( *s, constant );
     if(fb)
   {
     FrameBufferImage fb = GetFrameBufferImage( *s, constant );
     if(fb)
@@ -586,7 +586,7 @@ void Builder::SetupTask( RenderTask& task, const TreeNode& node, const Replaceme
     }
   }
 
     }
   }
 
-  if( OptionalString s = constant.IsString( IsChild(node, "screen-to-frame-buffer-function") ) )
+  if( OptionalString s = constant.IsString( IsChild(node, "screenToFrameBufferFunction") ) )
   {
     if("DEFAULT_SCREEN_TO_FRAMEBUFFER_FUNCTION" == *s)
     {
   {
     if("DEFAULT_SCREEN_TO_FRAMEBUFFER_FUNCTION" == *s)
     {
@@ -603,8 +603,7 @@ void Builder::SetupTask( RenderTask& task, const TreeNode& node, const Replaceme
   }
 
   // other setup is via the property system
   }
 
   // other setup is via the property system
-  SetProperties( node, task, constant ); // @ todo, remove 'source-actor', 'camera-actor'?
-
+  SetProperties( node, task, constant );
 }
 
 void Builder::CreateRenderTask( const std::string &name )
 }
 
 void Builder::CreateRenderTask( const std::string &name )
@@ -615,7 +614,7 @@ void Builder::CreateRenderTask( const std::string &name )
 
   const Stage& stage = Stage::GetCurrent();
 
 
   const Stage& stage = Stage::GetCurrent();
 
-  OptionalChild tasks = IsChild(*mParser.GetRoot(), "render-tasks");
+  OptionalChild tasks = IsChild(*mParser.GetRoot(), "renderTasks");
 
   if(tasks)
   {
 
   if(tasks)
   {
@@ -673,7 +672,7 @@ ShaderEffect Builder::GetShaderEffect( const std::string &name, const Replacemen
   }
   else
   {
   }
   else
   {
-    if( OptionalChild effects = IsChild( *mParser.GetRoot(), "shader-effects") )
+    if( OptionalChild effects = IsChild( *mParser.GetRoot(), "shaderEffects") )
     {
       if( OptionalChild effect = IsChild( *effects, name ) )
       {
     {
       if( OptionalChild effect = IsChild( *effects, name ) )
       {
@@ -709,7 +708,7 @@ FrameBufferImage Builder::GetFrameBufferImage( const std::string &name, const Re
   }
   else
   {
   }
   else
   {
-    if( OptionalChild images = IsChild( *mParser.GetRoot(), "frame-buffer-images") )
+    if( OptionalChild images = IsChild( *mParser.GetRoot(), "frameBufferImages") )
     {
       if( OptionalChild image = IsChild( *images, name ) )
       {
     {
       if( OptionalChild image = IsChild( *images, name ) )
       {
@@ -758,8 +757,8 @@ Path Builder::GetPath( const std::string& name )
             ret = Path::New();
             ret.SetProperty( Path::Property::POINTS, points);
 
             ret = Path::New();
             ret.SetProperty( Path::Property::POINTS, points);
 
-            //control-points property
-            if( OptionalChild pointsProperty = IsChild( *path, "control-points") )
+            //controlPoints property
+            if( OptionalChild pointsProperty = IsChild( *path, "controlPoints") )
             {
               Dali::Property::Value points(Property::ARRAY);
               if( SetPropertyFromNode( *pointsProperty, Property::ARRAY, points ) )
             {
               Dali::Property::Value points(Property::ARRAY);
               if( SetPropertyFromNode( *pointsProperty, Property::ARRAY, points ) )
@@ -832,8 +831,8 @@ PathConstrainer Builder::GetPathConstrainer( const std::string& name )
             ret = PathConstrainer::New();
             ret.SetProperty( PathConstrainer::Property::POINTS, points);
 
             ret = PathConstrainer::New();
             ret.SetProperty( PathConstrainer::Property::POINTS, points);
 
-            //control-points property
-            if( OptionalChild pointsProperty = IsChild( *pathConstrainer, "control-points") )
+            //controlPoints property
+            if( OptionalChild pointsProperty = IsChild( *pathConstrainer, "controlPoints") )
             {
               Dali::Property::Value points(Property::ARRAY);
               if( SetPropertyFromNode( *pointsProperty, Property::ARRAY, points ) )
             {
               Dali::Property::Value points(Property::ARRAY);
               if( SetPropertyFromNode( *pointsProperty, Property::ARRAY, points ) )
@@ -941,7 +940,7 @@ Dali::LinearConstrainer Builder::GetLinearConstrainer( const std::string& name )
             ret = Dali::LinearConstrainer::New();
             ret.SetProperty( LinearConstrainer::Property::VALUE, points);
 
             ret = Dali::LinearConstrainer::New();
             ret.SetProperty( LinearConstrainer::Property::VALUE, points);
 
-            //control-points property
+            //controlPoints property
             if( OptionalChild pointsProperty = IsChild( *linearConstrainer, "progress") )
             {
               Dali::Property::Value points(Property::ARRAY);
             if( OptionalChild pointsProperty = IsChild( *linearConstrainer, "progress") )
             {
               Dali::Property::Value points(Property::ARRAY);
@@ -1043,7 +1042,7 @@ void Builder::AddActors( const std::string &sectionName, Actor toActor )
     // to add automatically
     if( "stage" == sectionName )
     {
     // to add automatically
     if( "stage" == sectionName )
     {
-      if( OptionalChild renderTasks = IsChild(*mParser.GetRoot(), "render-tasks") )
+      if( OptionalChild renderTasks = IsChild(*mParser.GetRoot(), "renderTasks") )
       {
         if( OptionalChild tasks = IsChild(*renderTasks, "stage") )
         {
       {
         if( OptionalChild tasks = IsChild(*renderTasks, "stage") )
         {
index c2d77a7..7cd45b6 100644 (file)
@@ -102,7 +102,7 @@ Vector4 HexStringToVector4( const char* s )
 /**
  * A property value type can be forced when its unknown by a disambiguation convention in the json
  * ie  "myarray": [1,2,3,4] ; would be a vector but
 /**
  * A property value type can be forced when its unknown by a disambiguation convention in the json
  * ie  "myarray": [1,2,3,4] ; would be a vector but
- *     "myarray": {"type-cast":"array", "value":[1,2,3,4]} would be an array
+ *     "myarray": {"typeCast":"array", "value":[1,2,3,4]} would be an array
  * @param child The node whos string to search for a disambiguated type
  * @param value The value to set
  * @param overrideMap The user overriding constant map
  * @param child The node whos string to search for a disambiguated type
  * @param value The value to set
  * @param overrideMap The user overriding constant map
@@ -113,7 +113,7 @@ bool Disambiguated(const TreeNode& child, // ConstantLut& constantLut,
                    Dali::Property::Value& value,
                    const Replacement& replacement )
 {
                    Dali::Property::Value& value,
                    const Replacement& replacement )
 {
-  OptionalString childType = IsString( IsChild(child, "type-cast") );
+  OptionalString childType = IsString( IsChild(child, "typeCast") );
   OptionalChild childValue = IsChild(child, "value");
 
   if( childType && childValue && (2 == child.Size()) )
   OptionalChild childValue = IsChild(child, "value");
 
   if( childType && childValue && (2 == child.Size()) )
index b3372f2..ed22ef3 100644 (file)
@@ -459,7 +459,7 @@ struct SignalConnector<PropertyNotification>
 template <typename T>
 void SetActionOnSignal(const TreeNode &root, const TreeNode &child, Actor actor, Dali::Toolkit::Internal::Builder* const builder, SignalConnector<T>& connector)
 {
 template <typename T>
 void SetActionOnSignal(const TreeNode &root, const TreeNode &child, Actor actor, Dali::Toolkit::Internal::Builder* const builder, SignalConnector<T>& connector)
 {
-  OptionalString childActorName(IsString( IsChild(&child, "child-actor")) );
+  OptionalString childActorName(IsString( IsChild(&child, "childActor")) );
   OptionalString actorName(IsString( IsChild(&child, "actor")) );
   OptionalString propertyName(IsString( IsChild(&child, "property")) );
   OptionalChild  valueChild( IsChild(&child, "value") );
   OptionalString actorName(IsString( IsChild(&child, "actor")) );
   OptionalString propertyName(IsString( IsChild(&child, "property")) );
   OptionalChild  valueChild( IsChild(&child, "value") );
index a4c5101..4548ac9 100644 (file)
@@ -77,29 +77,29 @@ BaseHandle Create()
 DALI_TYPE_REGISTRATION_BEGIN( Toolkit::Button, Toolkit::Control, Create );
 
 DALI_PROPERTY_REGISTRATION( Toolkit, Button, "disabled",                     BOOLEAN, DISABLED                     )
 DALI_TYPE_REGISTRATION_BEGIN( Toolkit::Button, Toolkit::Control, Create );
 
 DALI_PROPERTY_REGISTRATION( Toolkit, Button, "disabled",                     BOOLEAN, DISABLED                     )
-DALI_PROPERTY_REGISTRATION( Toolkit, Button, "auto-repeating",               BOOLEAN, AUTO_REPEATING               )
-DALI_PROPERTY_REGISTRATION( Toolkit, Button, "initial-auto-repeating-delay", FLOAT,   INITIAL_AUTO_REPEATING_DELAY )
-DALI_PROPERTY_REGISTRATION( Toolkit, Button, "next-auto-repeating-delay",    FLOAT,   NEXT_AUTO_REPEATING_DELAY    )
+DALI_PROPERTY_REGISTRATION( Toolkit, Button, "autoRepeating",                BOOLEAN, AUTO_REPEATING               )
+DALI_PROPERTY_REGISTRATION( Toolkit, Button, "initialAutoRepeatingDelay",    FLOAT,   INITIAL_AUTO_REPEATING_DELAY )
+DALI_PROPERTY_REGISTRATION( Toolkit, Button, "nextAutoRepeatingDelay",       FLOAT,   NEXT_AUTO_REPEATING_DELAY    )
 DALI_PROPERTY_REGISTRATION( Toolkit, Button, "togglable",                    BOOLEAN, TOGGLABLE                    )
 DALI_PROPERTY_REGISTRATION( Toolkit, Button, "selected",                     BOOLEAN, SELECTED                     )
 DALI_PROPERTY_REGISTRATION( Toolkit, Button, "togglable",                    BOOLEAN, TOGGLABLE                    )
 DALI_PROPERTY_REGISTRATION( Toolkit, Button, "selected",                     BOOLEAN, SELECTED                     )
-DALI_PROPERTY_REGISTRATION( Toolkit, Button, "unselected-state-image",       STRING,  UNSELECTED_STATE_IMAGE       )
-DALI_PROPERTY_REGISTRATION( Toolkit, Button, "selected-state-image",         STRING,  SELECTED_STATE_IMAGE         )
-DALI_PROPERTY_REGISTRATION( Toolkit, Button, "disabled-state-image",         STRING,  DISABLED_STATE_IMAGE         )
-DALI_PROPERTY_REGISTRATION( Toolkit, Button, "unselected-color",             VECTOR4, UNSELECTED_COLOR             )
-DALI_PROPERTY_REGISTRATION( Toolkit, Button, "selected-color",               VECTOR4, SELECTED_COLOR               )
+DALI_PROPERTY_REGISTRATION( Toolkit, Button, "unselectedStateImage",         STRING,  UNSELECTED_STATE_IMAGE       )
+DALI_PROPERTY_REGISTRATION( Toolkit, Button, "selectedStateImage",           STRING,  SELECTED_STATE_IMAGE         )
+DALI_PROPERTY_REGISTRATION( Toolkit, Button, "disabledStateImage",           STRING,  DISABLED_STATE_IMAGE         )
+DALI_PROPERTY_REGISTRATION( Toolkit, Button, "unselectedColor",              VECTOR4, UNSELECTED_COLOR             )
+DALI_PROPERTY_REGISTRATION( Toolkit, Button, "selectedColor",                VECTOR4, SELECTED_COLOR               )
 DALI_PROPERTY_REGISTRATION( Toolkit, Button, "label",                        MAP,     LABEL                        )
 
 // Deprecated properties:
 DALI_PROPERTY_REGISTRATION( Toolkit, Button, "label",                        MAP,     LABEL                        )
 
 // Deprecated properties:
-DALI_PROPERTY_REGISTRATION( Toolkit, Button, "label-text",                   STRING,  LABEL_TEXT                   )
+DALI_PROPERTY_REGISTRATION( Toolkit, Button, "labelText",                    STRING,  LABEL_TEXT                   )
 
 // Signals:
 DALI_SIGNAL_REGISTRATION(   Toolkit, Button, "pressed",                               SIGNAL_PRESSED               )
 DALI_SIGNAL_REGISTRATION(   Toolkit, Button, "released",                              SIGNAL_RELEASED              )
 DALI_SIGNAL_REGISTRATION(   Toolkit, Button, "clicked",                               SIGNAL_CLICKED               )
 
 // Signals:
 DALI_SIGNAL_REGISTRATION(   Toolkit, Button, "pressed",                               SIGNAL_PRESSED               )
 DALI_SIGNAL_REGISTRATION(   Toolkit, Button, "released",                              SIGNAL_RELEASED              )
 DALI_SIGNAL_REGISTRATION(   Toolkit, Button, "clicked",                               SIGNAL_CLICKED               )
-DALI_SIGNAL_REGISTRATION(   Toolkit, Button, "state-changed",                         SIGNAL_STATE_CHANGED         )
+DALI_SIGNAL_REGISTRATION(   Toolkit, Button, "stateChanged",                          SIGNAL_STATE_CHANGED         )
 
 // Actions:
 
 // Actions:
-DALI_ACTION_REGISTRATION(   Toolkit, Button, "button-click",                          ACTION_BUTTON_CLICK          )
+DALI_ACTION_REGISTRATION(   Toolkit, Button, "buttonClick",                           ACTION_BUTTON_CLICK          )
 
 DALI_TYPE_REGISTRATION_END()
 
 
 DALI_TYPE_REGISTRATION_END()
 
index b168916..4331c87 100644 (file)
@@ -53,11 +53,11 @@ BaseHandle Create()
 
 DALI_TYPE_REGISTRATION_BEGIN( Toolkit::PushButton, Toolkit::Button, Create )
 
 
 DALI_TYPE_REGISTRATION_BEGIN( Toolkit::PushButton, Toolkit::Button, Create )
 
-DALI_PROPERTY_REGISTRATION( Toolkit, PushButton, "unselected-icon", STRING, UNSELECTED_ICON )
-DALI_PROPERTY_REGISTRATION( Toolkit, PushButton, "selected-icon", STRING, SELECTED_ICON )
-DALI_PROPERTY_REGISTRATION( Toolkit, PushButton, "icon-alignment", STRING, ICON_ALIGNMENT )
-DALI_PROPERTY_REGISTRATION( Toolkit, PushButton, "label-padding", STRING, LABEL_PADDING )
-DALI_PROPERTY_REGISTRATION( Toolkit, PushButton, "icon-padding", STRING, ICON_PADDING )
+DALI_PROPERTY_REGISTRATION( Toolkit, PushButton, "unselectedIcon",  STRING, UNSELECTED_ICON )
+DALI_PROPERTY_REGISTRATION( Toolkit, PushButton, "selectedIcon",  STRING, SELECTED_ICON )
+DALI_PROPERTY_REGISTRATION( Toolkit, PushButton, "iconAlignment",  STRING, ICON_ALIGNMENT )
+DALI_PROPERTY_REGISTRATION( Toolkit, PushButton, "labelPadding",  STRING, LABEL_PADDING )
+DALI_PROPERTY_REGISTRATION( Toolkit, PushButton, "iconPadding",  STRING, ICON_PADDING )
 
 DALI_TYPE_REGISTRATION_END()
 
 
 DALI_TYPE_REGISTRATION_END()
 
index 45a3152..e758f1f 100644 (file)
@@ -50,10 +50,10 @@ Dali::BaseHandle Create()
 
 DALI_TYPE_REGISTRATION_BEGIN( Toolkit::Magnifier, Toolkit::Control, Create )
 
 
 DALI_TYPE_REGISTRATION_BEGIN( Toolkit::Magnifier, Toolkit::Control, Create )
 
-DALI_PROPERTY_REGISTRATION( Toolkit, Magnifier, "frame-visibility",     BOOLEAN, FRAME_VISIBILITY     )
-DALI_PROPERTY_REGISTRATION( Toolkit, Magnifier, "magnification-factor", FLOAT,   MAGNIFICATION_FACTOR )
+DALI_PROPERTY_REGISTRATION( Toolkit, Magnifier, "frameVisibility",      BOOLEAN, FRAME_VISIBILITY     )
+DALI_PROPERTY_REGISTRATION( Toolkit, Magnifier, "magnificationFactor",  FLOAT,   MAGNIFICATION_FACTOR )
 
 
-DALI_ANIMATABLE_PROPERTY_REGISTRATION( Toolkit, Magnifier, "source-position", VECTOR3, SOURCE_POSITION )
+DALI_ANIMATABLE_PROPERTY_REGISTRATION( Toolkit, Magnifier, "sourcePosition",  VECTOR3, SOURCE_POSITION )
 
 DALI_TYPE_REGISTRATION_END()
 
 
 DALI_TYPE_REGISTRATION_END()
 
@@ -198,7 +198,7 @@ void Magnifier::Initialize()
   // Use a 1 frame delayed source position to determine the camera actor's position.
   // This is necessary as the viewport is determined by the Magnifier's Actor's World position (which is computed
   // at the end of the update cycle i.e. after constraints have been applied.)
   // Use a 1 frame delayed source position to determine the camera actor's position.
   // This is necessary as the viewport is determined by the Magnifier's Actor's World position (which is computed
   // at the end of the update cycle i.e. after constraints have been applied.)
-  //Property::Index propertySourcePositionDelayed = mCameraActor.RegisterProperty("delayed-source-position", Vector3::ZERO);
+  //Property::Index propertySourcePositionDelayed = mCameraActor.RegisterProperty("delayedSourcePosition",   Vector3::ZERO);
 
   constraint = Constraint::New<Vector3>( mCameraActor, Actor::Property::POSITION, CameraActorPositionConstraint(stageSize, mDefaultCameraDistance) );
   constraint.AddSource( Source( mSourceActor, Actor::Property::WORLD_POSITION ) );
 
   constraint = Constraint::New<Vector3>( mCameraActor, Actor::Property::POSITION, CameraActorPositionConstraint(stageSize, mDefaultCameraDistance) );
   constraint.AddSource( Source( mSourceActor, Actor::Property::WORLD_POSITION ) );
index f1f7a39..2c27f85 100644 (file)
@@ -52,15 +52,15 @@ BaseHandle Create()
 // Setup properties, signals and actions using the type-registry.
 DALI_TYPE_REGISTRATION_BEGIN( Toolkit::Model3dView, Toolkit::Control, Create );
 
 // Setup properties, signals and actions using the type-registry.
 DALI_TYPE_REGISTRATION_BEGIN( Toolkit::Model3dView, Toolkit::Control, Create );
 
-DALI_PROPERTY_REGISTRATION( Toolkit, Model3dView, "geometry-url", STRING, GEOMETRY_URL)
-DALI_PROPERTY_REGISTRATION( Toolkit, Model3dView, "material-url", STRING, MATERIAL_URL)
-DALI_PROPERTY_REGISTRATION( Toolkit, Model3dView, "images-url", STRING, IMAGES_URL)
-DALI_PROPERTY_REGISTRATION( Toolkit, Model3dView, "illumination-type", INTEGER, ILLUMINATION_TYPE)
-DALI_PROPERTY_REGISTRATION( Toolkit, Model3dView, "texture0-url", STRING, TEXTURE0_URL)
-DALI_PROPERTY_REGISTRATION( Toolkit, Model3dView, "texture1-url", STRING, TEXTURE1_URL)
-DALI_PROPERTY_REGISTRATION( Toolkit, Model3dView, "texture2-url", STRING, TEXTURE2_URL)
-
-DALI_ANIMATABLE_PROPERTY_REGISTRATION( Toolkit, Model3dView, "light-position", VECTOR3, LIGHT_POSITION)
+DALI_PROPERTY_REGISTRATION( Toolkit, Model3dView, "geometryUrl",  STRING, GEOMETRY_URL)
+DALI_PROPERTY_REGISTRATION( Toolkit, Model3dView, "materialUrl",  STRING, MATERIAL_URL)
+DALI_PROPERTY_REGISTRATION( Toolkit, Model3dView, "imagesUrl",  STRING, IMAGES_URL)
+DALI_PROPERTY_REGISTRATION( Toolkit, Model3dView, "illuminationType",  INTEGER, ILLUMINATION_TYPE)
+DALI_PROPERTY_REGISTRATION( Toolkit, Model3dView, "texture0Url",  STRING, TEXTURE0_URL)
+DALI_PROPERTY_REGISTRATION( Toolkit, Model3dView, "texture1Url",  STRING, TEXTURE1_URL)
+DALI_PROPERTY_REGISTRATION( Toolkit, Model3dView, "texture2Url",  STRING, TEXTURE2_URL)
+
+DALI_ANIMATABLE_PROPERTY_REGISTRATION( Toolkit, Model3dView, "lightPosition",  VECTOR3, LIGHT_POSITION)
 
 DALI_TYPE_REGISTRATION_END()
 
 
 DALI_TYPE_REGISTRATION_END()
 
index 14e8405..f3e2ed1 100644 (file)
@@ -224,14 +224,14 @@ BaseHandle Create()
 // Setup properties, signals and actions using the type-registry.
 DALI_TYPE_REGISTRATION_BEGIN( Toolkit::PageTurnView, Toolkit::Control, Create );
 
 // Setup properties, signals and actions using the type-registry.
 DALI_TYPE_REGISTRATION_BEGIN( Toolkit::PageTurnView, Toolkit::Control, Create );
 
-DALI_PROPERTY_REGISTRATION( Toolkit, PageTurnView, "page-size",       VECTOR2, PAGE_SIZE )
-DALI_PROPERTY_REGISTRATION( Toolkit, PageTurnView, "current-page-id", INTEGER, CURRENT_PAGE_ID )
-DALI_PROPERTY_REGISTRATION( Toolkit, PageTurnView, "spine-shadow",    VECTOR2, SPINE_SHADOW )
-
-DALI_SIGNAL_REGISTRATION( Toolkit, PageTurnView, "page-turn-started",  SIGNAL_PAGE_TURN_STARTED )
-DALI_SIGNAL_REGISTRATION( Toolkit, PageTurnView, "page-turn-finished", SIGNAL_PAGE_TURN_FINISHED )
-DALI_SIGNAL_REGISTRATION( Toolkit, PageTurnView, "page-pan-started",   SIGNAL_PAGE_PAN_STARTED )
-DALI_SIGNAL_REGISTRATION( Toolkit, PageTurnView, "page-pan-finished",  SIGNAL_PAGE_PAN_FINISHED )
+DALI_PROPERTY_REGISTRATION( Toolkit, PageTurnView, "pageSize",        VECTOR2, PAGE_SIZE )
+DALI_PROPERTY_REGISTRATION( Toolkit, PageTurnView, "currentPageId",   INTEGER, CURRENT_PAGE_ID )
+DALI_PROPERTY_REGISTRATION( Toolkit, PageTurnView, "spineShadow",     VECTOR2, SPINE_SHADOW )
+
+DALI_SIGNAL_REGISTRATION( Toolkit, PageTurnView, "pageTurnStarted",    SIGNAL_PAGE_TURN_STARTED )
+DALI_SIGNAL_REGISTRATION( Toolkit, PageTurnView, "pageTurnFinished",   SIGNAL_PAGE_TURN_FINISHED )
+DALI_SIGNAL_REGISTRATION( Toolkit, PageTurnView, "pagePanStarted",     SIGNAL_PAGE_PAN_STARTED )
+DALI_SIGNAL_REGISTRATION( Toolkit, PageTurnView, "pagePanFinished",    SIGNAL_PAGE_PAN_FINISHED )
 
 DALI_TYPE_REGISTRATION_END()
 
 
 DALI_TYPE_REGISTRATION_END()
 
index cb0c9e9..183c613 100644 (file)
@@ -52,8 +52,8 @@ struct ControlDetailType
  *  the app-developer      | which will provide   | app developer choose which signal
  *  can connect to.        | the signal.          | within the control to connect to.    */
 const ControlDetailType ControlDetails[] = {
  *  the app-developer      | which will provide   | app developer choose which signal
  *  can connect to.        | the signal.          | within the control to connect to.    */
 const ControlDetailType ControlDetails[] = {
-  { "control-signal-ok",     "control-ok",          "connect-signal-ok-selected"     },
-  { "control-signal-cancel", "control-cancel",      "connect-signal-cancel-selected" },
+  { "controlSignalOk",       "controlOk",           "connectSignalOkSelected"     },
+  { "controlSignalCancel",   "controlCancel",       "connectSignalCancelSelected" },
 };
 const unsigned int ControlDetailsCount = sizeof( ControlDetails ) / sizeof( ControlDetails[0] );
 
 };
 const unsigned int ControlDetailsCount = sizeof( ControlDetails ) / sizeof( ControlDetails[0] );
 
index 9153cbe..031f0fa 100755 (executable)
@@ -70,7 +70,7 @@ const Vector3      DEFAULT_TOAST_BOTTOM_PARENT_ORIGIN( 0.5f, 0.94f, 0.5f );
 const Vector3      DEFAULT_TOAST_WIDTH_OF_STAGE_RATIO( 0.75f, 0.75f, 0.75f );               ///< Amount of the stage's width that the toast popup will take up.
 
 /**
 const Vector3      DEFAULT_TOAST_WIDTH_OF_STAGE_RATIO( 0.75f, 0.75f, 0.75f );               ///< Amount of the stage's width that the toast popup will take up.
 
 /**
- * Creation function for named type "popup-toast".
+ * Creation function for named type "popupToast".
  * @return Handle to the new toast popup object.
  */
 BaseHandle CreateToast()
  * @return Handle to the new toast popup object.
  */
 BaseHandle CreateToast()
@@ -111,32 +111,32 @@ DALI_TYPE_REGISTRATION_BEGIN( Toolkit::Popup, Toolkit::Control, Create )
 DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "title",                             MAP,              TITLE                  )
 DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "content",                           MAP,              CONTENT                )
 DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "footer",                            MAP,              FOOTER                 )
 DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "title",                             MAP,              TITLE                  )
 DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "content",                           MAP,              CONTENT                )
 DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "footer",                            MAP,              FOOTER                 )
-DALI_PROPERTY_REGISTRATION( Toolkit, Popup, "display-state",  &n