From 0727b27d000e0ce5968846b51a55311592f04655 Mon Sep 17 00:00:00 2001 From: Paul Wisbey Date: Mon, 18 May 2015 18:02:44 +0100 Subject: [PATCH] Supply stylesheet using Application constructor --- demo/dali-demo.cpp | 2 +- demo/dali-table-view.cpp | 2 -- examples/animated-shapes/animated-shapes-example.cpp | 4 +--- examples/atlas/atlas-example.cpp | 2 +- examples/blocks/blocks-example.cpp | 4 +--- examples/bubble-effect/bubble-effect-example.cpp | 4 +--- examples/builder/examples.cpp | 4 +--- examples/buttons/buttons-example.cpp | 4 +--- examples/cluster/cluster-example.cpp | 4 +--- examples/cube-transition-effect/cube-transition-effect-example.cpp | 4 +--- examples/dissolve-effect/dissolve-effect-example.cpp | 4 +--- examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp | 5 +---- examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp | 4 +--- examples/item-view/item-view-example.cpp | 4 +--- examples/logging/logging-example.cpp | 4 +--- examples/magnifier/magnifier-example.cpp | 4 +--- examples/motion-blur/motion-blur-example.cpp | 2 +- examples/motion-stretch/motion-stretch-example.cpp | 4 +--- examples/new-window/new-window-example.cpp | 4 +--- examples/page-turn-view/page-turn-view-example.cpp | 4 +--- examples/path-animation/path-animation.cpp | 4 +--- examples/radial-menu/radial-menu-example.cpp | 4 +--- examples/refraction-effect/refraction-effect-example.cpp | 4 +--- examples/scripting/launcher.cpp | 3 --- examples/scripting/scripting-example.cpp | 2 +- examples/scroll-view/scroll-view-example.cpp | 4 +--- examples/shadow-bone-lighting/shadow-bone-lighting-example.cpp | 4 +--- examples/size-negotiation/size-negotiation-example.cpp | 4 +--- examples/text-field/text-field-example.cpp | 4 +--- examples/text-label-emojis/text-label-emojis.cpp | 2 +- examples/text-label-multi-language/text-label-multi-language-example.cpp | 4 +--- examples/text-label/text-label-example.cpp | 4 +--- examples/text-message-field/text-message-field-example.cpp | 2 +- shared/view.h | 7 ------- 34 files changed, 31 insertions(+), 94 deletions(-) diff --git a/demo/dali-demo.cpp b/demo/dali-demo.cpp index 78c2aae..cc0f9ef 100644 --- 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 e24f46a..9577a2e 100644 --- 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 29e03bb..b9c3755 100644 --- 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 c6cc76f..5cce8fb 100644 --- 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 23775b2..20a3e93 100644 --- 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 c5d8c4e..e34daa9 100644 --- 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 de2e0d1..79f50a1 100644 --- 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 1dfdce1..f3c597e 100644 --- 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 11e66ef..f9df49d 100644 --- 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 782ceaf..73da808 100644 --- 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 edbe3d9..bb39943 100644 --- 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 1a8d409..c8e7f19 100644 --- 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 259f0d2..6d77a2e 100644 --- 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 851cfee..fc94b02 100644 --- 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 949332a..3d20d6d 100644 --- 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 d20cd6b..10f104a 100644 --- 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 068ab31..fc37bd1 100644 --- 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 f32f750..ff60371 100644 --- 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 dcb2e64..9282c8c 100644 --- 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 4d2d7d7..c0fc98c 100644 --- 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 ba4ee5b..f1b1dd3 100644 --- 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 f171c3f..6f21081 100644 --- 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 2870f75..a220490 100644 --- 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 9c48b3f..5c81a9b 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 diff --git a/examples/scripting/scripting-example.cpp b/examples/scripting/scripting-example.cpp index 6a9c4b9..a09a3d8 100644 --- 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 b5b511a..0485cad 100644 --- 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 c1efad4..49e6142 100644 --- 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 2fdb979..6ed609f 100644 --- 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 12a29a9..59725d3 100644 --- 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 a727b54..f87dc91 100644 --- 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 8395487..a4344bb 100644 --- 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 5c1b7b0..1219290 100644 --- 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 d7403c0..d801c3b 100644 --- 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 1da219d..ce27187 100644 --- 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(); -- libgit2 0.21.4