update following the changes of the ControlRenderer property names

Change-Id: I2aea5bcde8b3a1a4b2bebdcb9ad525ed87a9847a

diff --git a/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp b/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
index 99fe02e..a5782ef 100644 (file)
--- a/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
+++ b/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
@@ -178,11 +178,11 @@ public:
     // Background image:
     Dali::Property::Map backgroundImage;
     backgroundImage.Insert( "rendererType",  "image" );
-    backgroundImage.Insert( "imageUrl",  BACKGROUND_IMAGE );
-    backgroundImage.Insert( "imageDesiredWidth",   stage.GetSize().width );
-    backgroundImage.Insert( "imageDesiredHeight",   stage.GetSize().height );
-    backgroundImage.Insert( "imageFittingMode",   "scaleToFill" );
-    backgroundImage.Insert( "imageSamplingMode",   "boxThenNearest" );
+    backgroundImage.Insert( "url",  BACKGROUND_IMAGE );
+    backgroundImage.Insert( "desiredWidth",   stage.GetSize().width );
+    backgroundImage.Insert( "desiredHeight",   stage.GetSize().height );
+    backgroundImage.Insert( "fittingMode",   "SCALE_TO_FILL" );
+    backgroundImage.Insert( "samplingMode",   "BOX_THEN_NEAREST" );
 
     Toolkit::ImageView background = Toolkit::ImageView::New();
     background.SetProperty( Toolkit::ImageView::Property::IMAGE, backgroundImage );

diff --git a/resources/scripts/background.json b/resources/scripts/background.json
index 62ffd08..365289c 100644 (file)
--- a/resources/scripts/background.json
+++ b/resources/scripts/background.json
@@ -45,8 +45,8 @@
       "heightResizePolicy":"SIZE_RELATIVE_TO_PARENT",
       "sizeModeFactor": [ 0.5, 0.333333333333, 1 ],
       "background": {
-        "rendererType": "svg",
-        "imageUrl": "{DEMO_IMAGE_DIR}Kid1.svg"
+        "rendererType": "image",
+        "url": "{DEMO_IMAGE_DIR}Kid1.svg"
       }
     },
 
@@ -77,7 +77,7 @@
       "sizeModeFactor": [ 0.5, 0.333333333333, 1 ],
       "background": {
         "rendererType": "image",
-        "imageUrl": "{DEMO_IMAGE_DIR}gallery-large-9.jpg"
+        "url": "{DEMO_IMAGE_DIR}gallery-large-9.jpg"
       }
     },