Supply stylesheet using Application constructor

Change-Id: Ieab919e1ef93b46b66f1049a2845005d94bbf72f

Supply stylesheet using Application constructor
Change-Id: Ieab919e1ef93b46b66f1049a2845005d94bbf72f
Paul Wisbey
1 parent acbfb8bb
Showing 34 changed files with 31 additions and 94 deletions
demo/dali-demo.cpp
demo/dali-table-view.cpp
examples/animated-shapes/animated-shapes-example.cpp
examples/atlas/atlas-example.cpp
examples/blocks/blocks-example.cpp
examples/bubble-effect/bubble-effect-example.cpp
examples/builder/examples.cpp
examples/buttons/buttons-example.cpp
examples/cluster/cluster-example.cpp
examples/cube-transition-effect/cube-transition-effect-example.cpp
examples/dissolve-effect/dissolve-effect-example.cpp
examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp
examples/item-view/item-view-example.cpp
examples/logging/logging-example.cpp
examples/magnifier/magnifier-example.cpp
examples/motion-blur/motion-blur-example.cpp
examples/motion-stretch/motion-stretch-example.cpp
examples/new-window/new-window-example.cpp
examples/page-turn-view/page-turn-view-example.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);
@@ -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();
@@ -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&amp; 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;
@@ -226,7 +226,7 @@ void RunTest( Application&amp; application )
 //
 int main( int argc, char **argv )
 {
-  gApplication = Application::New( &argc, &argv );
+  gApplication = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH );
   RunTest( gApplication );
@@ -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&amp; 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);
@@ -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&amp; 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);
@@ -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);
@@ -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&amp; 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 );
@@ -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&amp; 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);
@@ -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&amp; 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();
@@ -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();
@@ -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&amp; 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 );
@@ -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&amp; 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 );
@@ -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&amp; 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);
@@ -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&amp; 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 );
@@ -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&amp; 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 );
@@ -561,7 +561,7 @@ void RunTest(Application&amp; 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);
@@ -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&amp; 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);
@@ -123,8 +123,6 @@ NewWindowController::NewWindowController( Application&amp; application )
 void NewWindowController::Create( Application& app )
 {
-  DemoHelper::RequestThemeChange();
-
   Stage stage = Stage::GetCurrent();
   stage.SetBackgroundColor(Color::YELLOW);
@@ -464,7 +462,7 @@ void RunTest(Application&amp; 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;
@@ -227,8 +227,6 @@ void PageTurnController::OnInit( Application&amp; 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();
@@ -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&amp; 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 );
@@ -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);
@@ -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&amp; 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);
@@ -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
@@ -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();
@@ -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;
@@ -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&amp; 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);
@@ -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&amp; 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 );
@@ -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&amp; 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 );
@@ -143,7 +143,7 @@ void RunTest( Application&amp; 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 );
@@ -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&amp; 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 );
@@ -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&amp; 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 );
@@ -158,7 +158,7 @@ void RunTest( Application&amp; 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 );
@@ -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();