X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=examples%2Ftext-label-multi-language%2Ftext-label-multi-language-example.cpp;h=ba54b57a91942c969dd71720b1568f47f04d268f;hb=1c22cc2b91aaac24f5d39a2b7d36ba53e3386487;hp=c1f5e2d145ac049735a8058296303e6cc5aebec2;hpb=6ebeb6405d0302f5aba076aa63d650b91c2b8fd9;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

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 c1f5e2d..ba54b57 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,12 +20,12 @@
  * @brief Basic usage of TextLabel control
  */
 
-// INTERNAL INCLUDES
-#include "shared/multi-language-strings.h"
-
 // EXTERNAL INCLUDES
 #include <dali-toolkit/dali-toolkit.h>
-#include <dali/public-api/text-abstraction/text-abstraction.h>
+
+// INTERNAL INCLUDES
+#include "shared/multi-language-strings.h"
+#include "shared/view.h"
 
 using namespace Dali;
 using namespace Dali::Toolkit;
@@ -59,13 +59,14 @@ public:
     Stage stage = Stage::GetCurrent();
 
     stage.KeyEventSignal().Connect(this, &TextLabelMultiLanguageExample::OnKeyEvent);
+    stage.SetBackgroundColor( Color::WHITE );
 
     mTableView = Toolkit::TableView::New( NUMBER_OF_LANGUAGES, 1 );
-    mTableView.SetResizePolicy( FILL_TO_PARENT, WIDTH );
-    mTableView.SetResizePolicy( USE_NATURAL_SIZE, HEIGHT );
+    mTableView.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
+    mTableView.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT );
     mTableView.SetParentOrigin( ParentOrigin::TOP_LEFT );
     mTableView.SetAnchorPoint( AnchorPoint::TOP_LEFT );
-    mTableView.TouchedSignal().Connect( this, &TextLabelMultiLanguageExample::OnTouchEvent );
+    mTableView.TouchSignal().Connect( this, &TextLabelMultiLanguageExample::OnTouch );
     stage.Add( mTableView );
 
     for( unsigned int index = 0u; index < NUMBER_OF_LANGUAGES; ++index )
@@ -83,25 +84,25 @@ public:
     }
   }
 
-  bool OnTouchEvent( Actor actor, const TouchEvent& event )
+  bool OnTouch( Actor actor, const TouchData& event )
   {
     if( 1u == event.GetPointCount() )
     {
-      const TouchPoint::State state = event.GetPoint(0u).state;
+      const PointState::Type state = event.GetState( 0 );
 
       // Clamp to integer values; this is to reduce flicking due to pixel misalignment
-      const float localPoint = static_cast<float>( static_cast<int>( event.GetPoint( 0 ).local.y ) );
+      const float localPoint = static_cast<float>( static_cast<int>( event.GetLocalPosition( 0 ).y ) );
 
-      if( TouchPoint::Down == state )
+      if( PointState::DOWN == state )
       {
         mLastPoint = localPoint;
         mAnimation = Animation::New( 0.25f );
       }
-      else if( TouchPoint::Motion == state )
+      else if( PointState::MOTION == state )
       {
         if( mAnimation )
         {
-          mAnimation.MoveBy( mTableView, Vector3( 0.f, localPoint - mLastPoint, 0.f ), AlphaFunctions::Linear );
+          mAnimation.AnimateBy( Property(mTableView, Actor::Property::POSITION), Vector3( 0.f, localPoint - mLastPoint, 0.f ), AlphaFunction::LINEAR );
           mAnimation.Play();
           mLastPoint = localPoint;
         }
@@ -133,19 +134,10 @@ private:
   float          mLastPoint;
 };
 
-void RunTest( Application& application )
+int DALI_EXPORT_API main( int argc, char **argv )
 {
+  Application application = Application::New( &argc, &argv, DEMO_THEME_PATH );
   TextLabelMultiLanguageExample test( application );
-
   application.MainLoop();
-}
-
-/** Entry point for Linux & Tizen applications */
-int main( int argc, char **argv )
-{
-  Application application = Application::New( &argc, &argv );
-
-  RunTest( application );
-
   return 0;
 }