Supply stylesheet using Application constructor

Change-Id: Ieab919e1ef93b46b66f1049a2845005d94bbf72f

diff --git a/demo/dali-demo.cpp b/demo/dali-demo.cpp
index 78c2aae6a39c6cc124fda0bf503377bafd951540..cc0f9ef6b987fa9346bd145608db799440b50752 100644 (file)
--- a/demo/dali-demo.cpp
+++ b/demo/dali-demo.cpp
@@ -31,7 +31,7 @@ int main(int argc, char **argv)
   textdomain(DALI_DEMO_DOMAIN_LOCAL);
   setlocale(LC_ALL, DALI_LANG);
 
-  Application app = Application::New(&argc, &argv);
+  Application app = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH);
 
   // Create the demo launcher
   DaliTableView demo(app);

diff --git a/demo/dali-table-view.cpp b/demo/dali-table-view.cpp
index e24f46a48bbc4aeb7ff8b19d95a20bf48827a7ac..9577a2e7b4900e6c2fea40b18e78deb4e28f870e 100644 (file)
--- a/demo/dali-table-view.cpp
+++ b/demo/dali-table-view.cpp
@@ -204,8 +204,6 @@ void DaliTableView::SortAlphabetically( bool sortAlphabetically )
 
 void DaliTableView::Initialize( Application& application )
 {
-  DemoHelper::RequestThemeChange();
-
   Stage::GetCurrent().KeyEventSignal().Connect( this, &DaliTableView::OnKeyEvent );
 
   const Vector2 stageSize = Stage::GetCurrent().GetSize();

diff --git a/examples/animated-shapes/animated-shapes-example.cpp b/examples/animated-shapes/animated-shapes-example.cpp
index 29e03bbf322bc70a59d0d03c3b5bf630dc384e73..b9c37559bb6797feafedd5d2f82b2bd0d19e95b3 100644 (file)
--- a/examples/animated-shapes/animated-shapes-example.cpp
+++ b/examples/animated-shapes/animated-shapes-example.cpp
@@ -52,8 +52,6 @@ public:
   // The Init signal is received once (only) during the Application lifetime
   void Create( Application& application )
   {
-    DemoHelper::RequestThemeChange();
-
     // Get a handle to the stage
     Stage stage = Stage::GetCurrent();
 
@@ -376,7 +374,7 @@ void RunTest( Application& application )
 
 int main( int argc, char **argv )
 {
-  Application application = Application::New( &argc, &argv );
+  Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH );
   RunTest( application );
 
   return 0;

diff --git a/examples/atlas/atlas-example.cpp b/examples/atlas/atlas-example.cpp
index c6cc76f653e465a76bccf290cf5526b2a45139be..5cce8fb6b4cc8f93239bd8ffbeb7950a4c66295f 100644 (file)
--- a/examples/atlas/atlas-example.cpp
+++ b/examples/atlas/atlas-example.cpp
@@ -226,7 +226,7 @@ void RunTest( Application& application )
 //
 int main( int argc, char **argv )
 {
-  gApplication = Application::New( &argc, &argv );
+  gApplication = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH );
 
   RunTest( gApplication );
 

diff --git a/examples/blocks/blocks-example.cpp b/examples/blocks/blocks-example.cpp
index 23775b297a3cf01224455a92bcef0f753dac8b33..20a3e9383d4f31c4de988b8dd81e6d5cdaa91821 100644 (file)
--- a/examples/blocks/blocks-example.cpp
+++ b/examples/blocks/blocks-example.cpp
@@ -226,8 +226,6 @@ public:
    */
   void Create(Application& application)
   {
-    DemoHelper::RequestThemeChange();
-
     Stage::GetCurrent().KeyEventSignal().Connect(this, &ExampleController::OnKeyEvent);
 
     // Creates a default view with a default tool bar.
@@ -841,7 +839,7 @@ void RunTest(Application& app)
 
 int main(int argc, char **argv)
 {
-  Application app = Application::New(&argc, &argv);
+  Application app = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH);
 
   RunTest(app);
 

diff --git a/examples/bubble-effect/bubble-effect-example.cpp b/examples/bubble-effect/bubble-effect-example.cpp
index c5d8c4e90333a126aea0774f711428a04e319a45..e34daa9f76fbca08108aefebe8aea6f3787e64df 100644 (file)
--- a/examples/bubble-effect/bubble-effect-example.cpp
+++ b/examples/bubble-effect/bubble-effect-example.cpp
@@ -92,8 +92,6 @@ private:
   // The Init signal is received once (only) during the Application lifetime
   void Create(Application& app)
   {
-    DemoHelper::RequestThemeChange();
-
     Stage stage = Stage::GetCurrent();
     Vector2 stageSize = stage.GetSize();
 
@@ -320,7 +318,7 @@ RunTest(Application& app)
 int
 main(int argc, char **argv)
 {
-  Application app = Application::New(&argc, &argv);
+  Application app = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH);
 
   RunTest(app);
 

diff --git a/examples/builder/examples.cpp b/examples/builder/examples.cpp
index de2e0d1479538dbd9a85415f12202e52e950591d..79f50a17e64d87ee17efd7311235f2ccdc1b6d3e 100644 (file)
--- a/examples/builder/examples.cpp
+++ b/examples/builder/examples.cpp
@@ -493,8 +493,6 @@ public:
 
   void Create(Application& app)
   {
-    DemoHelper::RequestThemeChange();
-
     Stage stage = Stage::GetCurrent();
 
     Stage::GetCurrent().KeyEventSignal().Connect(this, &ExampleApp::OnKeyEvent);
@@ -618,7 +616,7 @@ int main(int argc, char **argv)
     }
   }
 
-  Application app = Application::New(&argc, &argv);
+  Application app = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH);
 
   ExampleApp dali_app(app);
 

diff --git a/examples/buttons/buttons-example.cpp b/examples/buttons/buttons-example.cpp
index 1dfdce18dff0da88bb23506a83c393323f08a977..f3c597eb5ad3ae3f3f5495ae3860536cfa3e4e32 100644 (file)
--- a/examples/buttons/buttons-example.cpp
+++ b/examples/buttons/buttons-example.cpp
@@ -97,8 +97,6 @@ class ButtonsController: public ConnectionTracker
   {
     // The Init signal is received once (only) during the Application lifetime
 
-    DemoHelper::RequestThemeChange();
-
     // Respond to key events
     Stage::GetCurrent().KeyEventSignal().Connect(this, &ButtonsController::OnKeyEvent);
 
@@ -528,7 +526,7 @@ void RunTest( Application& application )
 //
 int main( int argc, char **argv )
 {
-  Application application = Application::New( &argc, &argv );
+  Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH );
 
   RunTest( application );
 

diff --git a/examples/cluster/cluster-example.cpp b/examples/cluster/cluster-example.cpp
index 11e66ef6731adfaf0b74667e247b335e595952fd..f9df49dd933e1a77273020d5a1cf6faffdd18b97 100644 (file)
--- a/examples/cluster/cluster-example.cpp
+++ b/examples/cluster/cluster-example.cpp
@@ -360,8 +360,6 @@ public:
    */
   void Create(Application& application)
   {
-    DemoHelper::RequestThemeChange();
-
     Stage::GetCurrent().KeyEventSignal().Connect(this, &ClusterController::OnKeyEvent);
 
     // The Init signal is received once (only) during the Application lifetime
@@ -781,7 +779,7 @@ void RunTest(Application& app)
 //
 int main(int argc, char **argv)
 {
-  Application app = Application::New(&argc, &argv);
+  Application app = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH);
 
   RunTest(app);
 

diff --git a/examples/cube-transition-effect/cube-transition-effect-example.cpp b/examples/cube-transition-effect/cube-transition-effect-example.cpp
index 782ceaf8cda2fa490367f74b2b4eefd937be4931..73da8084599022428fd8e26d28d75405dec233cd 100644 (file)
--- a/examples/cube-transition-effect/cube-transition-effect-example.cpp
+++ b/examples/cube-transition-effect/cube-transition-effect-example.cpp
@@ -224,8 +224,6 @@ CubeTransitionApp::~CubeTransitionApp()
 
 void CubeTransitionApp::OnInit( Application& application )
 {
-  DemoHelper::RequestThemeChange();
-
   Stage::GetCurrent().KeyEventSignal().Connect(this, &CubeTransitionApp::OnKeyEvent);
 
   // Creates a default view with a default tool bar, the view is added to the stage.
@@ -435,7 +433,7 @@ void CubeTransitionApp::OnKeyEvent(const KeyEvent& event)
 // Entry point for Linux & Tizen applications
 int main( int argc, char **argv )
 {
-  Application application = Application::New( &argc, &argv );
+  Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH );
   CubeTransitionApp test( application );
   application.MainLoop();
 

diff --git a/examples/dissolve-effect/dissolve-effect-example.cpp b/examples/dissolve-effect/dissolve-effect-example.cpp
index edbe3d9a789f4395f9cd7e1331ea424123ad2124..bb399437f096b4b3f926b044b454d44802b4d458 100644 (file)
--- a/examples/dissolve-effect/dissolve-effect-example.cpp
+++ b/examples/dissolve-effect/dissolve-effect-example.cpp
@@ -204,8 +204,6 @@ DissolveEffectApp::~DissolveEffectApp()
 
 void DissolveEffectApp::OnInit( Application& application )
 {
-  DemoHelper::RequestThemeChange();
-
   Stage::GetCurrent().KeyEventSignal().Connect(this, &DissolveEffectApp::OnKeyEvent);
 
   // Creates a default view with a default tool bar, the view is added to the stage.
@@ -430,7 +428,7 @@ bool DissolveEffectApp::OnTimerTick()
 // Entry point for Linux & Tizen applications
 int main( int argc, char **argv )
 {
-  Application application = Application::New( &argc, &argv );
+  Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH );
   DissolveEffectApp test( application );
   application.MainLoop();
 

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 1a8d40925a22e3bbd8ffb392aa5952ef02a59d49..c8e7f194ba393b5951db97e53b9148ffc3d147d8 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
@@ -171,9 +171,6 @@ public:
   // The Init signal is received once (only) during the Application lifetime
   void Create( Application& application )
   {
-    // Apply the default theme:
-    DemoHelper::RequestThemeChange();
-
     // Get a handle to the stage
     Stage stage = Stage::GetCurrent();
 
@@ -732,7 +729,7 @@ void RunTest( Application& application )
 // Entry point for Linux & Tizen applications
 int main( int argc, char **argv )
 {
-  Application application = Application::New( &argc, &argv );
+  Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH );
 
   RunTest( application );
 

diff --git a/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp b/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp
index 259f0d25a753572ddd93cbd490442935d2994529..6d77a2ec77f86b275b65edebf3a1773119b0377c 100644 (file)
--- a/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp
+++ b/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp
@@ -287,8 +287,6 @@ public:
   {
     std::cout << "ImageScalingIrregularGridController::Create" << std::endl;
 
-    DemoHelper::RequestThemeChange();
-
     // Get a handle to the stage:
     Stage stage = Stage::GetCurrent();
 
@@ -611,7 +609,7 @@ void RunTest( Application& application )
 /** Entry point for Linux & Tizen applications */
 int main( int argc, char **argv )
 {
-  Application application = Application::New( &argc, &argv );
+  Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH );
 
   RunTest( application );
 

diff --git a/examples/item-view/item-view-example.cpp b/examples/item-view/item-view-example.cpp
index 851cfee2edd6b2bb327e3d9ceb8c247adb02953c..fc94b022d2b63fa2d0f88d3587417a8efeba1651 100644 (file)
--- a/examples/item-view/item-view-example.cpp
+++ b/examples/item-view/item-view-example.cpp
@@ -203,8 +203,6 @@ public:
    */
   void OnInit(Application& app)
   {
-    DemoHelper::RequestThemeChange();
-
     Stage stage = Dali::Stage::GetCurrent();
     stage.KeyEventSignal().Connect(this, &ItemViewExample::OnKeyEvent);
 
@@ -991,7 +989,7 @@ void RunTest(Application& app)
 
 int main(int argc, char **argv)
 {
-  Application app = Application::New(&argc, &argv);
+  Application app = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH);
 
   RunTest(app);
 

diff --git a/examples/logging/logging-example.cpp b/examples/logging/logging-example.cpp
index 949332a3dcafa23c096022205d29a750d179949e..3d20d6d2e31ebc5d6fd8e99ef320c41360f56456 100644 (file)
--- a/examples/logging/logging-example.cpp
+++ b/examples/logging/logging-example.cpp
@@ -145,8 +145,6 @@ class LoggingController: public ConnectionTracker
   {
     // The Init signal is received once (only) during the Application lifetime
 
-    DemoHelper::RequestThemeChange();
-
     mCurrentLogger = 0;
     mPerformanceLoggers.reserve( NUM_LOGGERS );
     mPerformanceLoggers.resize( NUM_LOGGERS );
@@ -756,7 +754,7 @@ void RunTest( Application& application )
 //
 int main( int argc, char **argv )
 {
-  Application application = Application::New( &argc, &argv );
+  Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH );
 
   RunTest( application );
 

diff --git a/examples/magnifier/magnifier-example.cpp b/examples/magnifier/magnifier-example.cpp
index d20cd6b6fed712db927c1b678433a36b1de0bcb3..10f104a1041aba17f4742084bfc127bcc4fb1b11 100644 (file)
--- a/examples/magnifier/magnifier-example.cpp
+++ b/examples/magnifier/magnifier-example.cpp
@@ -193,8 +193,6 @@ public:
    */
   void Create( Application& application )
   {
-    DemoHelper::RequestThemeChange();
-
     Stage::GetCurrent().KeyEventSignal().Connect(this, &ExampleController::OnKeyEvent);
 
     mStageSize = Stage::GetCurrent().GetSize();
@@ -415,7 +413,7 @@ void RunTest( Application& application )
 //
 int main( int argc, char **argv )
 {
-  Application application = Application::New( &argc, &argv );
+  Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH );
 
   RunTest( application );
 

diff --git a/examples/motion-blur/motion-blur-example.cpp b/examples/motion-blur/motion-blur-example.cpp
index 068ab31beddc12fc84c133893f924b1de4b7eb17..fc37bd108980fa0c013af00027799bf5ed6141b2 100644 (file)
--- a/examples/motion-blur/motion-blur-example.cpp
+++ b/examples/motion-blur/motion-blur-example.cpp
@@ -561,7 +561,7 @@ void RunTest(Application& app)
 //
 int main(int argc, char **argv)
 {
-  Application app = Application::New(&argc, &argv);
+  Application app = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH);
 
   RunTest(app);
 

diff --git a/examples/motion-stretch/motion-stretch-example.cpp b/examples/motion-stretch/motion-stretch-example.cpp
index f32f750c21d73cc15a186cf3b6c3c5a046f5902d..ff6037147ba91bd6d86337388379fc3f3b1cd6b9 100644 (file)
--- a/examples/motion-stretch/motion-stretch-example.cpp
+++ b/examples/motion-stretch/motion-stretch-example.cpp
@@ -125,8 +125,6 @@ public:
   {
     // The Init signal is received once (only) during the Application lifetime
 
-    DemoHelper::RequestThemeChange();
-
     Stage::GetCurrent().KeyEventSignal().Connect(this, &MotionStretchExampleApp::OnKeyEvent);
 
     // Creates a default view with a default tool bar.
@@ -442,7 +440,7 @@ void RunTest(Application& app)
 //
 int main(int argc, char **argv)
 {
-  Application app = Application::New(&argc, &argv);
+  Application app = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH);
 
   RunTest(app);
 

diff --git a/examples/new-window/new-window-example.cpp b/examples/new-window/new-window-example.cpp
index dcb2e64ae44f5a91417b09d909df928f3a24549f..9282c8c2bad75dd5086b46fd1d523b9be85d3a0c 100644 (file)
--- a/examples/new-window/new-window-example.cpp
+++ b/examples/new-window/new-window-example.cpp
@@ -123,8 +123,6 @@ NewWindowController::NewWindowController( Application& application )
 
 void NewWindowController::Create( Application& app )
 {
-  DemoHelper::RequestThemeChange();
-
   Stage stage = Stage::GetCurrent();
   stage.SetBackgroundColor(Color::YELLOW);
 
@@ -464,7 +462,7 @@ void RunTest(Application& app)
 
 int main(int argc, char **argv)
 {
-  gApplication = Application::New(&argc, &argv);
+  gApplication = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH);
   RunTest(gApplication);
 
   return 0;

diff --git a/examples/page-turn-view/page-turn-view-example.cpp b/examples/page-turn-view/page-turn-view-example.cpp
index 4d2d7d7e15af185ab9326c11c61e418100bfbec2..c0fc98cfa7d76405970042b1f5ec72c8a7d8cf56 100644 (file)
--- a/examples/page-turn-view/page-turn-view-example.cpp
+++ b/examples/page-turn-view/page-turn-view-example.cpp
@@ -227,8 +227,6 @@ void PageTurnController::OnInit( Application& app )
 {
   // The Init signal is received once ( only ) during the Application lifetime
 
-  DemoHelper::RequestThemeChange();
-
   Stage::GetCurrent().KeyEventSignal().Connect(this, &PageTurnController::OnKeyEvent);
 
   Stage stage = Stage::GetCurrent();
@@ -348,7 +346,7 @@ void PageTurnController::OnPageFinishedPan( PageTurnView pageTurnView )
 // Entry point for applications
 int main( int argc, char **argv )
 {
-  Application app = Application::New(&argc, &argv);
+  Application app = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH);
   PageTurnController test ( app );
 
   app.MainLoop();

diff --git a/examples/path-animation/path-animation.cpp b/examples/path-animation/path-animation.cpp
index ba4ee5b3d0595075768b64064039bcfdf9a9acdd..f1b1dd32fa0fc3074a661dae25a8a8eb28c68826 100644 (file)
--- a/examples/path-animation/path-animation.cpp
+++ b/examples/path-animation/path-animation.cpp
@@ -441,8 +441,6 @@ public:
    */
   void Create( Application& application )
   {
-    DemoHelper::RequestThemeChange();
-
     // Get a handle to the stage:
     Stage stage = Stage::GetCurrent();
 
@@ -512,7 +510,7 @@ void RunTest( Application& application )
 /** Entry point for Linux & Tizen applications */
 int main( int argc, char **argv )
 {
-  Application application = Application::New( &argc, &argv );
+  Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH );
 
   RunTest( application );
 

diff --git a/examples/radial-menu/radial-menu-example.cpp b/examples/radial-menu/radial-menu-example.cpp
index f171c3fe1a04de97ee7062d2a70bbd91ee7b8d6b..6f210810d6f685556959649055a497b3f5ae3a3d 100644 (file)
--- a/examples/radial-menu/radial-menu-example.cpp
+++ b/examples/radial-menu/radial-menu-example.cpp
@@ -122,8 +122,6 @@ RadialMenuExample::~RadialMenuExample()
 
 void RadialMenuExample::OnInit(Application& app)
 {
-  DemoHelper::RequestThemeChange();
-
   Stage stage = Dali::Stage::GetCurrent();
 
   // The Init signal is received once (only) during the Application lifetime
@@ -291,7 +289,7 @@ void RunTest(Application app)
 // Entry point for Linux & Tizen applications
 int main(int argc, char **argv)
 {
-  Application app = Application::New(&argc, &argv);
+  Application app = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH);
 
   RunTest(app);
 

diff --git a/examples/refraction-effect/refraction-effect-example.cpp b/examples/refraction-effect/refraction-effect-example.cpp
index 2870f7520ae0423b648afe32b21b5a578a98cea7..a22049000dabe1881dfa7ca8fcfa653fbe11af9e 100644 (file)
--- a/examples/refraction-effect/refraction-effect-example.cpp
+++ b/examples/refraction-effect/refraction-effect-example.cpp
@@ -320,8 +320,6 @@ private:
   // The Init signal is received once (only) during the Application lifetime
   void Create(Application& application)
   {
-    DemoHelper::RequestThemeChange();
-
     Stage stage = Stage::GetCurrent();
     mStageHalfSize = stage.GetSize() * 0.5f;
 
@@ -658,7 +656,7 @@ RunTest(Application& app)
 int
 main(int argc, char **argv)
 {
-  Application app = Application::New(&argc, &argv);
+  Application app = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH);
 
   RunTest(app);
 

diff --git a/examples/scripting/launcher.cpp b/examples/scripting/launcher.cpp
index 9c48b3f722197d110f535a289024dde8ea682afc..5c81a9b121d75e43cfc58e810ed8573b73229430 100644 (file)
--- 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

diff --git a/examples/scripting/scripting-example.cpp b/examples/scripting/scripting-example.cpp
index 6a9c4b9298abca0b9dd1879b62a994aee3243610..a09a3d85dc5c3307d63851e4fb925a838ea62579 100644 (file)
--- a/examples/scripting/scripting-example.cpp
+++ b/examples/scripting/scripting-example.cpp
@@ -88,7 +88,7 @@ int main( int argc, char* argv[] )
   }
 
 
-  Launcher daliApplication( Dali::Application::New( &argc, &argv ), jSONFileName, javaScriptFileName );
+  Launcher daliApplication( Dali::Application::New( &argc, &argv, DALI_DEMO_THEME_PATH ), jSONFileName, javaScriptFileName );
 
   daliApplication.MainLoop();
 

diff --git a/examples/scroll-view/scroll-view-example.cpp b/examples/scroll-view/scroll-view-example.cpp
index b5b511a6f3aacc342bb32dd05dd54745924d272c..0485caddccc8ba3c74b98a778f5b5248243d4c97 100644 (file)
--- a/examples/scroll-view/scroll-view-example.cpp
+++ b/examples/scroll-view/scroll-view-example.cpp
@@ -157,8 +157,6 @@ public:
    */
   void OnInit(Application& app)
   {
-    DemoHelper::RequestThemeChange();
-
     Stage stage = Dali::Stage::GetCurrent();
     stage.KeyEventSignal().Connect(this, &ExampleController::OnKeyEvent);
 
@@ -584,7 +582,7 @@ private:
 
 int main(int argc, char **argv)
 {
-  Application app = Application::New(&argc, &argv);
+  Application app = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH);
   ExampleController test(app);
   app.MainLoop();
   return 0;

diff --git a/examples/shadow-bone-lighting/shadow-bone-lighting-example.cpp b/examples/shadow-bone-lighting/shadow-bone-lighting-example.cpp
index c1efad45ddd137c71d60981c649d8ea329e5429e..49e6142db835c3fef52ea74e41feee46eedf3a90 100644 (file)
--- a/examples/shadow-bone-lighting/shadow-bone-lighting-example.cpp
+++ b/examples/shadow-bone-lighting/shadow-bone-lighting-example.cpp
@@ -122,8 +122,6 @@ public:
    */
   void Create(Application& app)
   {
-    DemoHelper::RequestThemeChange();
-
     srand(0); // Want repeatable path
 
     Stage::GetCurrent().KeyEventSignal().Connect(this, &TestApp::OnKeyEvent);
@@ -503,7 +501,7 @@ RunTest(Application& app)
 int
 main(int argc, char **argv)
 {
-  Application app = Application::New(&argc, &argv);
+  Application app = Application::New(&argc, &argv, DALI_DEMO_THEME_PATH);
 
   RunTest(app);
 

diff --git a/examples/size-negotiation/size-negotiation-example.cpp b/examples/size-negotiation/size-negotiation-example.cpp
index 2fdb979aad2a6121d584fee28bb8a811d767d1a4..6ed609fb358985f62ccdf8db78c0b728def40138 100644 (file)
--- a/examples/size-negotiation/size-negotiation-example.cpp
+++ b/examples/size-negotiation/size-negotiation-example.cpp
@@ -159,8 +159,6 @@ public:
   {
     // The Init signal is received once (only) during the Application lifetime
 
-    DemoHelper::RequestThemeChange();
-
     Stage stage = Stage::GetCurrent();
 
     // Respond to key events
@@ -1300,7 +1298,7 @@ void RunTest( Application& application )
 //
 int main( int argc, char **argv )
 {
-  Application application = Application::New( &argc, &argv );
+  Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH );
 
   RunTest( application );
 

diff --git a/examples/text-field/text-field-example.cpp b/examples/text-field/text-field-example.cpp
index 12a29a9ce02039963fdd0c1336ad701efbfe91c0..59725d3fffc4c29b67fe6ca606ee08c5ff7100dd 100644 (file)
--- a/examples/text-field/text-field-example.cpp
+++ b/examples/text-field/text-field-example.cpp
@@ -96,8 +96,6 @@ public:
    */
   void Create( Application& application )
   {
-    DemoHelper::RequestThemeChange();
-
     Stage stage = Stage::GetCurrent();
 
     mTapGestureDetector = TapGestureDetector::New();
@@ -239,7 +237,7 @@ void RunTest( Application& application )
 /** Entry point for Linux & Tizen applications */
 int main( int argc, char **argv )
 {
-  Application application = Application::New( &argc, &argv );
+  Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH );
 
   RunTest( application );
 

diff --git a/examples/text-label-emojis/text-label-emojis.cpp b/examples/text-label-emojis/text-label-emojis.cpp
index a727b54f97d94fc7ca4c6a8d75fd6f22d66e074a..f87dc9174739bdfcdf6684dacafb95f75d050671 100644 (file)
--- a/examples/text-label-emojis/text-label-emojis.cpp
+++ b/examples/text-label-emojis/text-label-emojis.cpp
@@ -143,7 +143,7 @@ void RunTest( Application& application )
 //
 int main( int argc, char **argv )
 {
-  Application application = Application::New( &argc, &argv );
+  Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH );
 
   RunTest( application );
 

diff --git a/examples/text-label-multi-language/text-label-multi-language-example.cpp b/examples/text-label-multi-language/text-label-multi-language-example.cpp
index 83954876bafc20390f0cf3bb954a9c64fd02be09..a4344bba203592c0234590b8569c171586dffc1f 100644 (file)
--- a/examples/text-label-multi-language/text-label-multi-language-example.cpp
+++ b/examples/text-label-multi-language/text-label-multi-language-example.cpp
@@ -57,8 +57,6 @@ public:
    */
   void Create( Application& application )
   {
-    DemoHelper::RequestThemeChange();
-
     Stage stage = Stage::GetCurrent();
 
     stage.KeyEventSignal().Connect(this, &TextLabelMultiLanguageExample::OnKeyEvent);
@@ -147,7 +145,7 @@ void RunTest( Application& application )
 /** Entry point for Linux & Tizen applications */
 int main( int argc, char **argv )
 {
-  Application application = Application::New( &argc, &argv );
+  Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH );
 
   RunTest( application );
 

diff --git a/examples/text-label/text-label-example.cpp b/examples/text-label/text-label-example.cpp
index 5c1b7b0638b762ecc080a50af1479ec16650538e..12192906acb9e1f534808e882ae29457f52fd31d 100644 (file)
--- a/examples/text-label/text-label-example.cpp
+++ b/examples/text-label/text-label-example.cpp
@@ -97,8 +97,6 @@ public:
    */
   void Create( Application& application )
   {
-    DemoHelper::RequestThemeChange();
-
     Stage stage = Stage::GetCurrent();
 
     stage.KeyEventSignal().Connect(this, &TextLabelExample::OnKeyEvent);
@@ -285,7 +283,7 @@ void RunTest( Application& application )
 /** Entry point for Linux & Tizen applications */
 int main( int argc, char **argv )
 {
-  Application application = Application::New( &argc, &argv );
+  Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH );
 
   RunTest( application );
 

diff --git a/examples/text-message-field/text-message-field-example.cpp b/examples/text-message-field/text-message-field-example.cpp
index d7403c0efbc287947b3d89f21690009bf517c0dc..d801c3b902139a95262c45be7100b0b83f29d178 100644 (file)
--- a/examples/text-message-field/text-message-field-example.cpp
+++ b/examples/text-message-field/text-message-field-example.cpp
@@ -158,7 +158,7 @@ void RunTest( Application& application )
 /** Entry point for Linux & Tizen applications */
 int main( int argc, char **argv )
 {
-  Application application = Application::New( &argc, &argv );
+  Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH );
 
   RunTest( application );
 

diff --git a/shared/view.h b/shared/view.h
index 1da219da594612ea09178bf5b35cd760f5295b5c..ce27187104b46ad7b42795bdf489303a2551ab49 100644 (file)
--- a/shared/view.h
+++ b/shared/view.h
@@ -53,13 +53,6 @@ const float                   DEFAULT_TEXT_STYLE_POINT_SIZE( 8.0f );
 const Dali::Toolkit::Alignment::Padding DEFAULT_PLAY_PADDING(12.0f, 12.0f, 12.0f, 12.0f);
 const Dali::Toolkit::Alignment::Padding DEFAULT_MODE_SWITCH_PADDING(8.0f, 8.0f, 8.0f, 8.0f);
 
-void RequestThemeChange()
-{
-  // Provide the stylesheet
-  Dali::Toolkit::StyleManager styleManager = Dali::Toolkit::StyleManager::Get();
-  styleManager.RequestThemeChange( DALI_DEMO_THEME_PATH );
-}
-
 float ScalePointSize(int pointSize)
 {
   Dali::Vector2 dpi = Dali::Stage::GetCurrent().GetDpi();