X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=examples%2Fvisual-transitions%2Ftransition-application.cpp;h=5192396850fccb14e620a9b59b48a3fa6e603d12;hb=a832af2813558a32f0a18747f3e6134ff6f6f301;hp=fcb7c00c70fd79694d0ca6b347ef40df74d13a2d;hpb=a523d825cb2fb4871e59f807338cdfc5e1e13d42;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

diff --git a/examples/visual-transitions/transition-application.cpp b/examples/visual-transitions/transition-application.cpp
index fcb7c00..5192396 100644
--- a/examples/visual-transitions/transition-application.cpp
+++ b/examples/visual-transitions/transition-application.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 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.
@@ -24,8 +24,6 @@
 
 // External includes
 #include <dali-toolkit/dali-toolkit.h>
-#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
-#include <dali-toolkit/devel-api/visuals/text-visual-properties.h>
 #include "beat-control.h"
 #include <cstdio>
 #include <sstream>
@@ -35,6 +33,16 @@
 using namespace Dali;
 using namespace Dali::Toolkit;
 
+namespace
+{
+
+void SetLabelText( Button button, const char* label )
+{
+  button.SetProperty( Toolkit::Button::Property::LABEL, label );
+}
+
+}
+
 namespace Demo
 {
 
@@ -43,7 +51,6 @@ const char* DALI_LOGO_PATH( DEMO_IMAGE_DIR "Logo-for-demo.png" );
 const char* DALI_ROBOT_MODEL_PATH( DEMO_MODEL_DIR "ToyRobot-Metal.obj" );
 const char* DALI_ROBOT_MATERIAL_PATH( DEMO_MODEL_DIR "ToyRobot-Metal.mtl" );
 
-
 TransitionApplication::TransitionApplication( Application& application )
 : mApplication( application ),
   mTitle(),
@@ -92,8 +99,8 @@ void TransitionApplication::Create( Application& application )
   mBeatControl = BeatControl::New();
   mBeatControl.SetName("BeatControl");
   mBeatControl.SetProperty( BeatControl::Property::BEAT_VISUAL, Property::Map()
-                            .Add( DevelVisual::Property::TRANSFORM, Property::Map()
-                                  .Add( DevelVisual::Transform::Property::SIZE, Vector2(0.5f, 0.5f) ) ) );
+                            .Add( Visual::Property::TRANSFORM, Property::Map()
+                                  .Add( Visual::Transform::Property::SIZE, Vector2(0.5f, 0.5f) ) ) );
 
   mBeatControl.SetAnchorPoint( AnchorPoint::CENTER );
   mBeatControl.SetParentOrigin( ParentOrigin::CENTER );
@@ -114,8 +121,8 @@ void TransitionApplication::Create( Application& application )
   {
     Property::Map map;
     CreateVisualMap( i, map );
-    map.Add( DevelVisual::Property::TRANSFORM, Property::Map()
-             .Add( DevelVisual::Transform::Property::SIZE, Vector2(0.8f, 0.8f) ) );
+    map.Add( Visual::Property::TRANSFORM, Property::Map()
+             .Add( Visual::Transform::Property::SIZE, Vector2(0.8f, 0.8f) )  );
     mVisualButtons[i] = BeatControl::New();
     mVisualButtons[i].SetProperty( BeatControl::Property::BEAT_VISUAL, map );
     mVisualButtons[i].SetName("VisualButton");
@@ -151,10 +158,11 @@ void TransitionApplication::Create( Application& application )
     mActionButtons[i].ClickedSignal().Connect( this, &TransitionApplication::OnActionButtonClicked );
     actionButtonLayout.AddChild( mActionButtons[i], TableView::CellPosition( 0, 1+i ) );
   }
-  mActionButtons[0].SetLabelText( "Bounce" );
-  mActionButtons[1].SetLabelText( "X" );
-  mActionButtons[2].SetLabelText( "Y" );
-  mActionButtons[3].SetLabelText( "Fade" );
+
+  SetLabelText( mActionButtons[0], "Bounce" );
+  SetLabelText( mActionButtons[1], "X" );
+  SetLabelText( mActionButtons[2], "Y" );
+  SetLabelText( mActionButtons[3], "Fade" );
 
   contentLayout.Add( actionButtonLayout );
   contentLayout.SetFitHeight(3);
@@ -166,20 +174,20 @@ void TransitionApplication::CreateVisualMap( int index, Property::Map& map )
   {
     case 0:
     {
-      map[ Visual::Property::TYPE ] = Visual::COLOR;
+      map[ Toolkit::Visual::Property::TYPE ] = Visual::COLOR;
       map[ ColorVisual::Property::MIX_COLOR ] = Color::YELLOW;
       break;
     }
     case 1:
     {
-      map[ Visual::Property::TYPE ] = Visual::BORDER;
+      map[ Toolkit::Visual::Property::TYPE ] = Visual::BORDER;
       map[ BorderVisual::Property::COLOR ] = Color::GREEN;
       map[ BorderVisual::Property::SIZE ] = 5;
       break;
     }
     case 2:
     {
-      map[ Visual::Property::TYPE ] = Visual::GRADIENT;
+      map[ Toolkit::Visual::Property::TYPE ] = Visual::GRADIENT;
 
       Property::Array stopOffsets;
       stopOffsets.PushBack( 0.0f );
@@ -202,21 +210,21 @@ void TransitionApplication::CreateVisualMap( int index, Property::Map& map )
     }
     case 3:
     {
-      map[ Visual::Property::TYPE ] = Visual::IMAGE;
+      map[ Toolkit::Visual::Property::TYPE ] = Visual::IMAGE;
       map[ ImageVisual::Property::URL ] = DALI_LOGO_PATH;
       break;
     }
     case 4:
     {
-      map[ Visual::Property::TYPE ] = Visual::IMAGE;
+      map[ Toolkit::Visual::Property::TYPE ] = Visual::IMAGE;
       map[ ImageVisual::Property::URL ] = DEMO_IMAGE_DIR "preMultAlpha.png";
-      map[ DevelVisual::Property::PREMULTIPLIED_ALPHA ] = true;
+      map[ Visual::Property::PREMULTIPLIED_ALPHA ] = true;
       break;
     }
 
     case 5:
     {
-      map[ Visual::Property::TYPE ] = Visual::MESH;
+      map[ Toolkit::Visual::Property::TYPE ] = Visual::MESH;
       map[ MeshVisual::Property::OBJECT_URL ] = DALI_ROBOT_MODEL_PATH;
       map[ MeshVisual::Property::MATERIAL_URL ] = DALI_ROBOT_MATERIAL_PATH;
       map[ MeshVisual::Property::TEXTURES_PATH ] = DEMO_IMAGE_DIR;
@@ -226,7 +234,7 @@ void TransitionApplication::CreateVisualMap( int index, Property::Map& map )
 
     case 6:
     {
-      map[ Visual::Property::TYPE ] = Visual::PRIMITIVE;
+      map[ Toolkit::Visual::Property::TYPE ] = Visual::PRIMITIVE;
 
       map[ PrimitiveVisual::Property::SHAPE ] = PrimitiveVisual::Shape::BEVELLED_CUBE;
       map[ PrimitiveVisual::Property::BEVEL_PERCENTAGE ] = 0.3f;
@@ -240,21 +248,21 @@ void TransitionApplication::CreateVisualMap( int index, Property::Map& map )
     case 7:
     {
       // NPatch
-      map[ Visual::Property::TYPE ] = Visual::IMAGE;
+      map[ Toolkit::Visual::Property::TYPE ] = Visual::IMAGE;
       map[ ImageVisual::Property::URL ] = DEMO_IMAGE_DIR "button-up-16.9.png";
       break;
     }
     case 8:
     {
       // SVG
-      map[ Visual::Property::TYPE ] = Visual::IMAGE;
+      map[ Toolkit::Visual::Property::TYPE ] = Visual::IMAGE;
       map[ ImageVisual::Property::URL ] = DEMO_IMAGE_DIR "Kid1.svg";
       break;
     }
 
     case 9:
     {
-      map[ Visual::Property::TYPE ] = DevelVisual::TEXT;
+      map[ Toolkit::Visual::Property::TYPE ] = Visual::TEXT;
       map[ TextVisual::Property::TEXT ] = "Text";
       map[ TextVisual::Property::TEXT_COLOR ] = Color::CYAN;
       map[ TextVisual::Property::POINT_SIZE ] = 10;
@@ -263,7 +271,7 @@ void TransitionApplication::CreateVisualMap( int index, Property::Map& map )
 
     default:
     {
-      map[ Visual::Property::TYPE ] = Visual::COLOR;
+      map[ Toolkit::Visual::Property::TYPE ] = Visual::COLOR;
       map[ ColorVisual::Property::MIX_COLOR ] = Color::MAGENTA;
       break;
     }
@@ -277,8 +285,8 @@ bool TransitionApplication::OnVisualButtonClicked( Actor actor, const TouchData&
     int visual = actor.GetProperty<int>( mVisualIndex );
     Property::Map map;
     CreateVisualMap( visual, map );
-    map.Add( DevelVisual::Property::TRANSFORM, Property::Map()
-             .Add( DevelVisual::Transform::Property::SIZE, Vector2( 0.5f, 0.5f ) ) );
+    map.Add( Visual::Property::TRANSFORM, Property::Map()
+             .Add( Visual::Transform::Property::SIZE, Vector2( 0.5f, 0.5f ) ) );
     mBeatControl.SetProperty( BeatControl::Property::BEAT_VISUAL, map );
   }
   return true;