Peter M. Groen / dali-demo

Commit e839ccd8e2f06b0fca531643b97cde30d81e8d25

Authored by Adeel Kazmi
Committed by Gerrit Code Review
2 parents f4d164f7 fdd44e74

Merge "Remove usage of deprecated APIs" into devel/master

Inline Side-by-side
Showing 4 changed files with 10 additions and 14 deletions
examples/animated-gradient-call-active/animated-gradient-call-active.cpp
  View file @e839ccd
1 1 /*
2   -* Copyright (c) 2017 Samsung Electronics Co., Ltd.
  2 +* Copyright (c) 2019 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -212,7 +212,7 @@ private:
212 212 mCallStartButton.SetProperty( DevelButton::Property::SELECTED_BACKGROUND_VISUAL, ICON_CALL_IMAGE );
213 213 mCallStartButton.SetProperty( DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, ICON_CALL_IMAGE );
214 214 mCallStartButton.SetProperty( Control::Property::BACKGROUND, ICON_CALL_IMAGE );
215   - mCallStartButton.SetLabelText("");
  215 + mCallStartButton.SetProperty( Button::Property::LABEL, "" );
216 216  
217 217 mStage.Add( mCallStartButton );
218 218 mStage.Add( mButtonIconDecall );
... ... @@ -293,7 +293,7 @@ private:
293 293 mCallEndButton.SetProperty( DevelButton::Property::SELECTED_BACKGROUND_VISUAL, "" );
294 294 mCallEndButton.SetProperty( DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, "" );
295 295 mCallEndButton.SetStyleName( DECLINE_BUTTON_STYLE_STR );
296   - mCallEndButton.SetLabelText("");
  296 + mCallEndButton.SetProperty( Button::Property::LABEL, "" );
297 297  
298 298 mButtonClip.Add( mCallEndButton );
299 299 mButtonClip.Add( mButtonIcon );
... ...
examples/bezier-curve/bezier-curve-example.cpp
  View file @e839ccd
1 1 /*
2   - * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2019 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -212,7 +212,7 @@ public:
212 212 PushButton play = PushButton::New();
213 213 play.SetName("Play");
214 214 play.SetParentOrigin(ParentOrigin::CENTER);
215   - play.SetLabelText("Play");
  215 + play.SetProperty( Button::Property::LABEL, "Play");
216 216 play.ClickedSignal().Connect( this, &BezierCurveExample::OnPlayClicked );
217 217  
218 218 contentLayout.Add( play );
... ...
examples/homescreen-benchmark/homescreen-benchmark.cpp
  View file @e839ccd
1 1 /*
2   - * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2019 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -199,22 +199,18 @@ public:
199 199 Actor AddPage()
200 200 {
201 201 // Create root page actor.
202   - Actor pageActor;
  202 + Toolkit::Control pageActor;
203 203  
204 204 if( mConfig.mTableViewEnabled )
205 205 {
206   - Toolkit::TableView tableView = Toolkit::TableView::New( mConfig.mRows, mConfig.mCols );
207   -
208   - // Create geometry batcher for table view.
209   - tableView.SetBackgroundColor( Vector4( 0.0f, 0.0f, 0.0f, 0.5f ) );
210   - pageActor = tableView;
  206 + pageActor = Toolkit::TableView::New( mConfig.mRows, mConfig.mCols );
211 207 }
212 208 else
213 209 {
214 210 pageActor = Toolkit::Control::New();
215   - pageActor.SetProperty( Toolkit::Control::Property::BACKGROUND_COLOR, Vector4( 0.0f, 0.0f, 0.0f, 0.5f ) );
216 211 }
217 212  
  213 + pageActor.SetBackgroundColor( Vector4( 0.0f, 0.0f, 0.0f, 0.5f ) );
218 214 pageActor.SetParentOrigin( ParentOrigin::CENTER );
219 215 pageActor.SetAnchorPoint( AnchorPoint::CENTER );
220 216 pageActor.SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS );
... ...
examples/super-blur-view/super-blur-view-example.cpp
  View file @e839ccd
... ... @@ -71,7 +71,7 @@ private:
71 71 mPushButton = PushButton::New();
72 72 mPushButton.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
73 73 mPushButton.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER );
74   - mPushButton.SetProperty( Button::Property::LABEL_TEXT, "Blur" );
  74 + mPushButton.SetProperty( Button::Property::LABEL, "Blur" );
75 75 mPushButton.PressedSignal().Connect( this, &SuperBlurViewExample::OnButtonPressed );
76 76 mPushButton.ReleasedSignal().Connect( this, &SuperBlurViewExample::OnButtonReleased );
77 77 stage.Add( mPushButton );
... ...