/*
- * 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.
#include <dali-toolkit-test-suite-utils.h>
#include <dali-toolkit/dali-toolkit.h>
-#include <dali-toolkit/devel-api/controls/progress-bar/progress-bar.h>
-#include <dali-toolkit/devel-api/visuals/text-visual-properties.h>
-#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
-#include <dali-toolkit/public-api/visuals/image-visual-properties.h>
+#include <dali/devel-api/actors/actor-devel.h>
using namespace Dali;
using namespace Dali::Toolkit;
// Create the ProgressBar actor
ProgressBar progressBar = ProgressBar::New();
Stage::GetCurrent().Add( progressBar );
- progressBar.SetParentOrigin(ParentOrigin::TOP_LEFT);
- progressBar.SetAnchorPoint(ParentOrigin::TOP_LEFT);
+ progressBar.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
+ progressBar.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT);
progressBar.SetSize( Vector2( Stage::GetCurrent().GetSize().x, 20.0f ) );
progressBar.SetPosition( 0.0f, 0.0f );
progressBar.ValueChangedSignal().Connect( &OnProgressBarValueChanged );
tet_infoline( "UtcDaliProgressBarSetPropertyP" );
ProgressBar progressBar = ProgressBar::New();
- progressBar.SetParentOrigin(ParentOrigin::TOP_LEFT);
- progressBar.SetAnchorPoint(ParentOrigin::TOP_LEFT);
+ progressBar.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
+ progressBar.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT);
progressBar.SetSize( Vector2( Stage::GetCurrent().GetSize().x, 20.0f ) );
progressBar.SetPosition( 0.0f, 0.0f );
progressBar.ValueChangedSignal().Connect( &OnProgressBarValueChanged );
DALI_TEST_EQUALS( textString, std::string( "test1" ), TEST_LOCATION );
Property::Map textVisualMap2;
- textVisualMap2.Insert( Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::TEXT );
+ textVisualMap2.Insert( Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT );
textVisualMap2.Insert( Toolkit::TextVisual::Property::TEXT, "test2" );
textVisualMap2.Insert( Toolkit::TextVisual::Property::POINT_SIZE, 12.0f );
progressBar.SetProperty(ProgressBar::Property::LABEL_VISUAL, textVisualMap2);
tet_infoline( "UtcDaliProgressBarSetPropertyP1" );
ProgressBar progressBar = ProgressBar::New();
- progressBar.SetParentOrigin(ParentOrigin::TOP_LEFT);
- progressBar.SetAnchorPoint(ParentOrigin::TOP_LEFT);
+ progressBar.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
+ progressBar.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT);
progressBar.SetSize( Vector2( Stage::GetCurrent().GetSize().x, 20.0f ) );
progressBar.SetPosition( 0.0f, 0.0f );
progressBar.ValueChangedSignal().Connect( &OnProgressBarValueChanged );
tet_infoline( "UtcDaliProgressBarSetPropertyP2" );
ProgressBar progressBar = ProgressBar::New();
- progressBar.SetParentOrigin(ParentOrigin::TOP_LEFT);
- progressBar.SetAnchorPoint(ParentOrigin::TOP_LEFT);
+ progressBar.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT);
+ progressBar.SetProperty( Actor::Property::ANCHOR_POINT,ParentOrigin::TOP_LEFT);
progressBar.SetPosition( 0.0f, 0.0f );
progressBar.SetProperty(ProgressBar::Property::LABEL_VISUAL, "test");
progressBar.SetProperty(ProgressBar::Property::INDETERMINATE, true);