X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=examples%2Fscripting%2Flauncher.cpp;h=2362696e4dbcbc5b249b7e173a40bc0d33d8c621;hb=5fbb9e39fabb292daf6600dfdd4c637fe52faae2;hp=9c48b3f722197d110f535a289024dde8ea682afc;hpb=d6045205a5493e9d1509fa286cf9bc588e3529ac;p=platform%2Fcore%2Fuifw%2Fdali-demo.git diff --git a/examples/scripting/launcher.cpp b/examples/scripting/launcher.cpp index 9c48b3f..2362696 100644 --- a/examples/scripting/launcher.cpp +++ b/examples/scripting/launcher.cpp @@ -48,7 +48,6 @@ Launcher::Launcher( Dali::Application application, std::string layoutFileName, s mJSONFileName(layoutFileName ), mJavaScriptFileName( scriptFileName ) { - mApplication.InitSignal().Connect( this, &Launcher::Create ); } @@ -58,8 +57,6 @@ Launcher::~Launcher() void Launcher::Create( Dali::Application& application ) { - DemoHelper::RequestThemeChange(); - TextLabel textActor = TextLabel::New( "JSON & JavaScript Launcher..." ); // Reposition the actor @@ -82,9 +79,9 @@ void Launcher::Create( Dali::Application& application ) mBuilder = Toolkit::Builder::New(); 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; mBuilder.AddConstants( defaultDirs ); std::string json_data(GetFileContents( mJSONFileName ));