X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=builder%2Fdali-builder.cpp;h=ac2b1dfdaaa8777765fa44314aaef794d82b4a0c;hb=3daf6de364bc2f66277f6a0fb7eab33973368a13;hp=9f70d71fa9dd4c48bcbbaea87241be1c837a0a32;hpb=4c735b1a526e92865428ce68260489c6c637207c;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

diff --git a/builder/dali-builder.cpp b/builder/dali-builder.cpp
index 9f70d71..ac2b1df 100644
--- a/builder/dali-builder.cpp
+++ b/builder/dali-builder.cpp
@@ -28,16 +28,14 @@
 
 #include <dali/dali.h>
 #include <dali-toolkit/dali-toolkit.h>
-#include <dali-toolkit/public-api/builder/builder.h>
-#include <dali-toolkit/public-api/builder/tree-node.h>
+#include <dali-toolkit/devel-api/builder/builder.h>
+#include <dali-toolkit/devel-api/builder/tree-node.h>
 #include <iostream>
 #include <map>
 #include <string>
 #include <fstream>
 #include <streambuf>
-#include <boost/scoped_ptr.hpp>
 
-//#include <boost/regex.hpp>
 #include "sys/stat.h"
 #include <ctime>
 
@@ -58,7 +56,7 @@ std::string JSON_BROKEN("                                      \
     {                                                          \
       'type':'TextActor',                                      \
       'size': [50,50,1],                                       \
-      'parent-origin': 'CENTER',                               \
+      'parentOrigin': 'CENTER',                                \
       'text':'COULD NOT LOAD JSON FILE'                        \
     }                                                          \
   ]                                                            \
@@ -195,14 +193,15 @@ private:
   void ReloadJsonFile(Builder& builder, Layer& layer)
   {
     Stage stage = Stage::GetCurrent();
+    stage.SetBackgroundColor( Color::WHITE );
 
     builder = Builder::New();
     builder.QuitSignal().Connect( this, &ExampleApp::OnBuilderQuit );
 
     Property::Map defaultDirs;
-    defaultDirs[ TOKEN_STRING(DALI_IMAGE_DIR) ]  = DALI_IMAGE_DIR;
-    defaultDirs[ TOKEN_STRING(DALI_MODEL_DIR) ]  = DALI_MODEL_DIR;
-    defaultDirs[ TOKEN_STRING(DALI_SCRIPT_DIR) ] = DALI_SCRIPT_DIR;
+    defaultDirs[ TOKEN_STRING(DEMO_IMAGE_DIR) ]  = DEMO_IMAGE_DIR;
+    defaultDirs[ TOKEN_STRING(DEMO_MODEL_DIR) ]  = DEMO_MODEL_DIR;
+    defaultDirs[ TOKEN_STRING(DEMO_SCRIPT_DIR) ] = DEMO_SCRIPT_DIR;
 
     builder.AddConstants( defaultDirs );
 
@@ -298,11 +297,10 @@ private:
 //------------------------------------------------------------------------------
 int main(int argc, char **argv)
 {
-  Application dali_app = Application::New(&argc, &argv);
 
+  Application dali_app = Application::New(&argc, &argv, DEMO_THEME_PATH);
   ExampleApp app(dali_app);
 
-
   if(argc > 1)
   {
     std::cout << "Loading file:" << argc << " " << argv[1] << std::endl;