Peter M. Groen / dali-demo

Commit 6982eca1b10283747278f42f4e048e914cd8a491

Authored by Adeel Kazmi
Committed by Agnelo Vaz
1 parent df310b8a

Updates following Button API changes 

Change-Id: Ie3f30c5e5297249a391e7b26cdfdbded40fb5ad8
Inline Side-by-side
Showing 31 changed files with 170 additions and 198 deletions
examples/animated-gradient-call-active/animated-gradient-call-active.cpp
  View file @6982eca
@@ -17,7 +17,6 @@ @@ -17,7 +17,6 @@
17 #include <dali/dali.h> 17 #include <dali/dali.h>
18 #include <dali-toolkit/dali-toolkit.h> 18 #include <dali-toolkit/dali-toolkit.h>
19 #include <iostream> 19 #include <iostream>
20 -#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>  
21 #include <dali-toolkit/devel-api/visuals/animated-gradient-visual-properties-devel.h> 20 #include <dali-toolkit/devel-api/visuals/animated-gradient-visual-properties-devel.h>
22 #include <dali-toolkit/devel-api/visuals/visual-properties-devel.h> 21 #include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
23 #include <dali/integration-api/debug.h> 22 #include <dali/integration-api/debug.h>
@@ -209,8 +208,8 @@ private: @@ -209,8 +208,8 @@ private:
209 mCallStartButton.SetSize( BUTTON_CALL_START_SIZE * SCALED_WIDTH ); 208 mCallStartButton.SetSize( BUTTON_CALL_START_SIZE * SCALED_WIDTH );
210 mCallStartButton.SetPosition( BUTTON_CALL_START_POSITION * SCALED_WIDTH ); 209 mCallStartButton.SetPosition( BUTTON_CALL_START_POSITION * SCALED_WIDTH );
211 mCallStartButton.ClickedSignal().Connect( this, &CallController::OnButtonClicked ); 210 mCallStartButton.ClickedSignal().Connect( this, &CallController::OnButtonClicked );
212 - mCallStartButton.SetProperty( DevelButton::Property::SELECTED_BACKGROUND_VISUAL, ICON_CALL_IMAGE );  
213 - mCallStartButton.SetProperty( DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, ICON_CALL_IMAGE ); 211 + mCallStartButton.SetProperty( Button::Property::SELECTED_BACKGROUND_VISUAL, ICON_CALL_IMAGE );
  212 + mCallStartButton.SetProperty( Button::Property::UNSELECTED_BACKGROUND_VISUAL, ICON_CALL_IMAGE );
214 mCallStartButton.SetProperty( Control::Property::BACKGROUND, ICON_CALL_IMAGE ); 213 mCallStartButton.SetProperty( Control::Property::BACKGROUND, ICON_CALL_IMAGE );
215 mCallStartButton.SetProperty( Button::Property::LABEL, "" ); 214 mCallStartButton.SetProperty( Button::Property::LABEL, "" );
216 215
@@ -290,8 +289,8 @@ private: @@ -290,8 +289,8 @@ private:
290 mCallEndButton.SetSize( BUTTON_DECALL_SIZE * SCALED_WIDTH ); 289 mCallEndButton.SetSize( BUTTON_DECALL_SIZE * SCALED_WIDTH );
291 mCallEndButton.SetPosition( BUTTON_DECALL_POSITION * SCALED_WIDTH ); 290 mCallEndButton.SetPosition( BUTTON_DECALL_POSITION * SCALED_WIDTH );
292 mCallEndButton.ClickedSignal().Connect( this, &CallController::OnButtonClicked ); 291 mCallEndButton.ClickedSignal().Connect( this, &CallController::OnButtonClicked );
293 - mCallEndButton.SetProperty( DevelButton::Property::SELECTED_BACKGROUND_VISUAL, "" );  
294 - mCallEndButton.SetProperty( DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, "" ); 292 + mCallEndButton.SetProperty( Button::Property::SELECTED_BACKGROUND_VISUAL, "" );
  293 + mCallEndButton.SetProperty( Button::Property::UNSELECTED_BACKGROUND_VISUAL, "" );
295 mCallEndButton.SetStyleName( DECLINE_BUTTON_STYLE_STR ); 294 mCallEndButton.SetStyleName( DECLINE_BUTTON_STYLE_STR );
296 mCallEndButton.SetProperty( Button::Property::LABEL, "" ); 295 mCallEndButton.SetProperty( Button::Property::LABEL, "" );
297 296
examples/animated-images/animated-images-example.cpp
  View file @6982eca
1 /* 1 /*
2 - * Copyright (c) 2018 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2019 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@ @@ -16,7 +16,6 @@
16 */ 16 */
17 17
18 #include <dali-toolkit/dali-toolkit.h> 18 #include <dali-toolkit/dali-toolkit.h>
19 -#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>  
20 #include <dali-toolkit/devel-api/controls/control-devel.h> 19 #include <dali-toolkit/devel-api/controls/control-devel.h>
21 #include <dali-toolkit/devel-api/visuals/animated-image-visual-actions-devel.h> 20 #include <dali-toolkit/devel-api/visuals/animated-image-visual-actions-devel.h>
22 21
@@ -228,8 +227,8 @@ private: @@ -228,8 +227,8 @@ private:
228 227
229 // Create a push button, and add it as child of the control 228 // Create a push button, and add it as child of the control
230 Toolkit::PushButton animateButton = Toolkit::PushButton::New(); 229 Toolkit::PushButton animateButton = Toolkit::PushButton::New();
231 - animateButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, PLAY_ICON_UNSELECTED );  
232 - animateButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, PLAY_ICON_SELECTED ); 230 + animateButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, PLAY_ICON_UNSELECTED );
  231 + animateButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, PLAY_ICON_SELECTED );
233 animateButton.SetParentOrigin( ParentOrigin::CENTER ); 232 animateButton.SetParentOrigin( ParentOrigin::CENTER );
234 animateButton.SetAnchorPoint( AnchorPoint::CENTER ); 233 animateButton.SetAnchorPoint( AnchorPoint::CENTER );
235 animateButton.ClickedSignal().Connect( this, &AnimatedImageController::OnPlayButtonClicked ); 234 animateButton.ClickedSignal().Connect( this, &AnimatedImageController::OnPlayButtonClicked );
examples/bubble-effect/bubble-effect-example.cpp
  View file @6982eca
1 /* 1 /*
2 - * Copyright (c) 2017 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2019 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@ @@ -18,7 +18,6 @@
18 #include <dali/dali.h> 18 #include <dali/dali.h>
19 #include <dali-toolkit/dali-toolkit.h> 19 #include <dali-toolkit/dali-toolkit.h>
20 #include <dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.h> 20 #include <dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.h>
21 -#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>  
22 #include "shared/view.h" 21 #include "shared/view.h"
23 #include "shared/utility.h" 22 #include "shared/utility.h"
24 23
@@ -109,8 +108,8 @@ private: @@ -109,8 +108,8 @@ private:
109 108
110 // Add a button to change background. (right of toolbar) 109 // Add a button to change background. (right of toolbar)
111 mChangeBackgroundButton = Toolkit::PushButton::New(); 110 mChangeBackgroundButton = Toolkit::PushButton::New();
112 - mChangeBackgroundButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, CHANGE_BACKGROUND_ICON );  
113 - mChangeBackgroundButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, CHANGE_BACKGROUND_ICON_SELECTED ); 111 + mChangeBackgroundButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, CHANGE_BACKGROUND_ICON );
  112 + mChangeBackgroundButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, CHANGE_BACKGROUND_ICON_SELECTED );
114 mChangeBackgroundButton.ClickedSignal().Connect( this, &BubbleEffectExample::OnChangeIconClicked ); 113 mChangeBackgroundButton.ClickedSignal().Connect( this, &BubbleEffectExample::OnChangeIconClicked );
115 toolBar.AddControl( mChangeBackgroundButton, 114 toolBar.AddControl( mChangeBackgroundButton,
116 DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, 115 DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage,
@@ -118,8 +117,8 @@ private: @@ -118,8 +117,8 @@ private:
118 DemoHelper::DEFAULT_MODE_SWITCH_PADDING ); 117 DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
119 // Add a button to change bubble shape. ( left of bar ) 118 // Add a button to change bubble shape. ( left of bar )
120 mChangeBubbleShapeButton = Toolkit::PushButton::New(); 119 mChangeBubbleShapeButton = Toolkit::PushButton::New();
121 - mChangeBubbleShapeButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, CHANGE_BUBBLE_SHAPE_ICON );  
122 - mChangeBubbleShapeButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, CHANGE_BUBBLE_SHAPE_ICON_SELECTED ); 120 + mChangeBubbleShapeButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, CHANGE_BUBBLE_SHAPE_ICON );
  121 + mChangeBubbleShapeButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, CHANGE_BUBBLE_SHAPE_ICON_SELECTED );
123 mChangeBubbleShapeButton.ClickedSignal().Connect( this, &BubbleEffectExample::OnChangeIconClicked ); 122 mChangeBubbleShapeButton.ClickedSignal().Connect( this, &BubbleEffectExample::OnChangeIconClicked );
124 toolBar.AddControl( mChangeBubbleShapeButton, 123 toolBar.AddControl( mChangeBubbleShapeButton,
125 DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, 124 DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage,
examples/builder/examples.cpp
  View file @6982eca
1 /* 1 /*
2 - * Copyright (c) 2017 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2019 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -25,7 +25,6 @@ @@ -25,7 +25,6 @@
25 #include <dali-toolkit/devel-api/builder/builder.h> 25 #include <dali-toolkit/devel-api/builder/builder.h>
26 #include <dali-toolkit/devel-api/builder/tree-node.h> 26 #include <dali-toolkit/devel-api/builder/tree-node.h>
27 #include <dali-toolkit/devel-api/builder/json-parser.h> 27 #include <dali-toolkit/devel-api/builder/json-parser.h>
28 -#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>  
29 #include <dali-toolkit/devel-api/controls/popup/popup.h> 28 #include <dali-toolkit/devel-api/controls/popup/popup.h>
30 #include <dali-toolkit/devel-api/controls/navigation-view/navigation-view.h> 29 #include <dali-toolkit/devel-api/controls/navigation-view/navigation-view.h>
31 30
@@ -479,8 +478,8 @@ public: @@ -479,8 +478,8 @@ public:
479 478
480 // Create an edit mode button. (left of toolbar) 479 // Create an edit mode button. (left of toolbar)
481 Toolkit::PushButton backButton = Toolkit::PushButton::New(); 480 Toolkit::PushButton backButton = Toolkit::PushButton::New();
482 - backButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, EDIT_IMAGE );  
483 - backButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, EDIT_IMAGE_SELECTED ); 481 + backButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, EDIT_IMAGE );
  482 + backButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, EDIT_IMAGE_SELECTED );
484 backButton.ClickedSignal().Connect( this, &ExampleApp::OnBackButtonPressed); 483 backButton.ClickedSignal().Connect( this, &ExampleApp::OnBackButtonPressed);
485 backButton.SetLeaveRequired( true ); 484 backButton.SetLeaveRequired( true );
486 mToolBar.AddControl( backButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalLeft, DemoHelper::DEFAULT_MODE_SWITCH_PADDING ); 485 mToolBar.AddControl( backButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalLeft, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
examples/cube-transition-effect/cube-transition-effect-example.cpp
  View file @6982eca
@@ -24,7 +24,6 @@ @@ -24,7 +24,6 @@
24 24
25 #include <dali/dali.h> 25 #include <dali/dali.h>
26 #include <dali-toolkit/dali-toolkit.h> 26 #include <dali-toolkit/dali-toolkit.h>
27 -#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>  
28 #include <dali-toolkit/devel-api/controls/buttons/toggle-button.h> 27 #include <dali-toolkit/devel-api/controls/buttons/toggle-button.h>
29 #include <dali-toolkit/devel-api/transition-effects/cube-transition-effect.h> 28 #include <dali-toolkit/devel-api/transition-effects/cube-transition-effect.h>
30 #include <dali-toolkit/devel-api/transition-effects/cube-transition-cross-effect.h> 29 #include <dali-toolkit/devel-api/transition-effects/cube-transition-cross-effect.h>
@@ -236,8 +235,8 @@ void CubeTransitionApp::OnInit( Application&amp; application ) @@ -236,8 +235,8 @@ void CubeTransitionApp::OnInit( Application&amp; application )
236 235
237 //Add an slideshow icon on the right of the title 236 //Add an slideshow icon on the right of the title
238 mSlideshowButton = Toolkit::PushButton::New(); 237 mSlideshowButton = Toolkit::PushButton::New();
239 - mSlideshowButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, SLIDE_SHOW_START_ICON );  
240 - mSlideshowButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, SLIDE_SHOW_START_ICON_SELECTED ); 238 + mSlideshowButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, SLIDE_SHOW_START_ICON );
  239 + mSlideshowButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, SLIDE_SHOW_START_ICON_SELECTED );
241 mSlideshowButton.ClickedSignal().Connect( this, &CubeTransitionApp::OnSildeshowButtonClicked ); 240 mSlideshowButton.ClickedSignal().Connect( this, &CubeTransitionApp::OnSildeshowButtonClicked );
242 mToolBar.AddControl( mSlideshowButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalCenter, DemoHelper::DEFAULT_PLAY_PADDING ); 241 mToolBar.AddControl( mSlideshowButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalCenter, DemoHelper::DEFAULT_PLAY_PADDING );
243 242
@@ -355,8 +354,8 @@ bool CubeTransitionApp::OnSildeshowButtonClicked( Toolkit::Button button ) @@ -355,8 +354,8 @@ bool CubeTransitionApp::OnSildeshowButtonClicked( Toolkit::Button button )
355 if( mSlideshow ) 354 if( mSlideshow )
356 { 355 {
357 mPanGestureDetector.Detach( mContent ); 356 mPanGestureDetector.Detach( mContent );
358 - mSlideshowButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, SLIDE_SHOW_STOP_ICON );  
359 - mSlideshowButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, SLIDE_SHOW_STOP_ICON_SELECTED ); 357 + mSlideshowButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, SLIDE_SHOW_STOP_ICON );
  358 + mSlideshowButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, SLIDE_SHOW_STOP_ICON_SELECTED );
360 mPanPosition = Vector2( mViewSize.width, mViewSize.height*0.5f ); 359 mPanPosition = Vector2( mViewSize.width, mViewSize.height*0.5f );
361 mPanDisplacement = Vector2( -10.f, 0.f ); 360 mPanDisplacement = Vector2( -10.f, 0.f );
362 mViewTimer.Start(); 361 mViewTimer.Start();
@@ -364,8 +363,8 @@ bool CubeTransitionApp::OnSildeshowButtonClicked( Toolkit::Button button ) @@ -364,8 +363,8 @@ bool CubeTransitionApp::OnSildeshowButtonClicked( Toolkit::Button button )
364 else 363 else
365 { 364 {
366 mPanGestureDetector.Attach( mContent ); 365 mPanGestureDetector.Attach( mContent );
367 - mSlideshowButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, SLIDE_SHOW_START_ICON );  
368 - mSlideshowButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, SLIDE_SHOW_START_ICON_SELECTED ); 366 + mSlideshowButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, SLIDE_SHOW_START_ICON );
  367 + mSlideshowButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, SLIDE_SHOW_START_ICON_SELECTED );
369 mViewTimer.Stop(); 368 mViewTimer.Stop();
370 } 369 }
371 return true; 370 return true;
examples/dissolve-effect/dissolve-effect-example.cpp
  View file @6982eca
1 /* 1 /*
2 - * Copyright (c) 2017 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2019 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@ @@ -23,7 +23,6 @@
23 23
24 #include <dali/dali.h> 24 #include <dali/dali.h>
25 #include <dali-toolkit/dali-toolkit.h> 25 #include <dali-toolkit/dali-toolkit.h>
26 -#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>  
27 #include <dali-toolkit/devel-api/shader-effects/dissolve-effect.h> 26 #include <dali-toolkit/devel-api/shader-effects/dissolve-effect.h>
28 27
29 using namespace Dali; 28 using namespace Dali;
@@ -222,8 +221,8 @@ void DissolveEffectApp::OnInit( Application&amp; application ) @@ -222,8 +221,8 @@ void DissolveEffectApp::OnInit( Application&amp; application )
222 221
223 // Add an effect-changing button on the right of the tool bar. 222 // Add an effect-changing button on the right of the tool bar.
224 mEffectChangeButton = Toolkit::PushButton::New(); 223 mEffectChangeButton = Toolkit::PushButton::New();
225 - mEffectChangeButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, EFFECT_HIGHP_IMAGE );  
226 - mEffectChangeButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, EFFECT_HIGHP_IMAGE_SELECTED ); 224 + mEffectChangeButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, EFFECT_HIGHP_IMAGE );
  225 + mEffectChangeButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, EFFECT_HIGHP_IMAGE_SELECTED );
227 mEffectChangeButton.ClickedSignal().Connect( this, &DissolveEffectApp::OnEffectButtonClicked ); 226 mEffectChangeButton.ClickedSignal().Connect( this, &DissolveEffectApp::OnEffectButtonClicked );
228 mToolBar.AddControl( mEffectChangeButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING ); 227 mToolBar.AddControl( mEffectChangeButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
229 228
@@ -233,8 +232,8 @@ void DissolveEffectApp::OnInit( Application&amp; application ) @@ -233,8 +232,8 @@ void DissolveEffectApp::OnInit( Application&amp; application )
233 232
234 // Add an slide-show button on the right of the title 233 // Add an slide-show button on the right of the title
235 mPlayStopButton = Toolkit::PushButton::New(); 234 mPlayStopButton = Toolkit::PushButton::New();
236 - mPlayStopButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, PLAY_ICON );  
237 - mPlayStopButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, PLAY_ICON_SELECTED ); 235 + mPlayStopButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, PLAY_ICON );
  236 + mPlayStopButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, PLAY_ICON_SELECTED );
238 mPlayStopButton.ClickedSignal().Connect( this, &DissolveEffectApp::OnSildeshowButtonClicked ); 237 mPlayStopButton.ClickedSignal().Connect( this, &DissolveEffectApp::OnSildeshowButtonClicked );
239 mToolBar.AddControl( mPlayStopButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalCenter, DemoHelper::DEFAULT_PLAY_PADDING ); 238 mToolBar.AddControl( mPlayStopButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalCenter, DemoHelper::DEFAULT_PLAY_PADDING );
240 239
@@ -342,14 +341,14 @@ bool DissolveEffectApp::OnEffectButtonClicked( Toolkit::Button button ) @@ -342,14 +341,14 @@ bool DissolveEffectApp::OnEffectButtonClicked( Toolkit::Button button )
342 if(mUseHighPrecision) 341 if(mUseHighPrecision)
343 { 342 {
344 mTitleActor.SetProperty( TextLabel::Property::TEXT, std::string(APPLICATION_TITLE_HIGHP) ); 343 mTitleActor.SetProperty( TextLabel::Property::TEXT, std::string(APPLICATION_TITLE_HIGHP) );
345 - mEffectChangeButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, EFFECT_HIGHP_IMAGE );  
346 - mEffectChangeButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, EFFECT_HIGHP_IMAGE_SELECTED ); 344 + mEffectChangeButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, EFFECT_HIGHP_IMAGE );
  345 + mEffectChangeButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, EFFECT_HIGHP_IMAGE_SELECTED );
347 } 346 }
348 else 347 else
349 { 348 {
350 mTitleActor.SetProperty( TextLabel::Property::TEXT, std::string(APPLICATION_TITLE_MEDIUMP) ); 349 mTitleActor.SetProperty( TextLabel::Property::TEXT, std::string(APPLICATION_TITLE_MEDIUMP) );
351 - mEffectChangeButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, EFFECT_MEDIUMP_IMAGE );  
352 - mEffectChangeButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, EFFECT_MEDIUMP_IMAGE_SELECTED ); 350 + mEffectChangeButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, EFFECT_MEDIUMP_IMAGE );
  351 + mEffectChangeButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, EFFECT_MEDIUMP_IMAGE_SELECTED );
353 } 352 }
354 353
355 return true; 354 return true;
@@ -360,16 +359,16 @@ bool DissolveEffectApp::OnSildeshowButtonClicked( Toolkit::Button button ) @@ -360,16 +359,16 @@ bool DissolveEffectApp::OnSildeshowButtonClicked( Toolkit::Button button )
360 mSlideshow = !mSlideshow; 359 mSlideshow = !mSlideshow;
361 if( mSlideshow ) 360 if( mSlideshow )
362 { 361 {
363 - mPlayStopButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, STOP_ICON );  
364 - mPlayStopButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, STOP_ICON_SELECTED ); 362 + mPlayStopButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, STOP_ICON );
  363 + mPlayStopButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, STOP_ICON_SELECTED );
365 mPanGestureDetector.Detach( mParent ); 364 mPanGestureDetector.Detach( mParent );
366 mViewTimer.Start(); 365 mViewTimer.Start();
367 mTimerReady = false; 366 mTimerReady = false;
368 } 367 }
369 else 368 else
370 { 369 {
371 - mPlayStopButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, PLAY_ICON );  
372 - mPlayStopButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, PLAY_ICON_SELECTED ); 370 + mPlayStopButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, PLAY_ICON );
  371 + mPlayStopButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, PLAY_ICON_SELECTED );
373 mTimerReady = true; 372 mTimerReady = true;
374 mPanGestureDetector.Attach( mParent ); 373 mPanGestureDetector.Attach( mParent );
375 } 374 }
examples/effects-view/effects-view-example.cpp
  View file @6982eca
@@ -22,7 +22,6 @@ @@ -22,7 +22,6 @@
22 22
23 #include <dali/dali.h> 23 #include <dali/dali.h>
24 #include <dali-toolkit/dali-toolkit.h> 24 #include <dali-toolkit/dali-toolkit.h>
25 -#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>  
26 #include <dali-toolkit/devel-api/controls/effects-view/effects-view.h> 25 #include <dali-toolkit/devel-api/controls/effects-view/effects-view.h>
27 #include <sstream> 26 #include <sstream>
28 27
@@ -133,8 +132,8 @@ void EffectsViewApp::OnAppInitialize( Application&amp; application ) @@ -133,8 +132,8 @@ void EffectsViewApp::OnAppInitialize( Application&amp; application )
133 132
134 // Creates view change button. 133 // Creates view change button.
135 Toolkit::PushButton viewButton = Toolkit::PushButton::New(); 134 Toolkit::PushButton viewButton = Toolkit::PushButton::New();
136 - viewButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, VIEW_SWAP_IMAGE );  
137 - viewButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, VIEW_SWAP_SELECTED_IMAGE ); 135 + viewButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, VIEW_SWAP_IMAGE );
  136 + viewButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, VIEW_SWAP_SELECTED_IMAGE );
138 // Connects the view change button clicked signal to the OnView method. 137 // Connects the view change button clicked signal to the OnView method.
139 viewButton.ClickedSignal().Connect( this, &EffectsViewApp::ChangeEffectSize ); 138 viewButton.ClickedSignal().Connect( this, &EffectsViewApp::ChangeEffectSize );
140 mToolBar.AddControl( viewButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING ); 139 mToolBar.AddControl( viewButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
examples/flex-container/flex-container-example.cpp
  View file @6982eca
1 /* 1 /*
2 - * Copyright (c) 2017 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2019 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@ @@ -20,7 +20,6 @@
20 20
21 #include <dali/dali.h> 21 #include <dali/dali.h>
22 #include <dali-toolkit/dali-toolkit.h> 22 #include <dali-toolkit/dali-toolkit.h>
23 -#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>  
24 23
25 using namespace Dali; 24 using namespace Dali;
26 using namespace Dali::Toolkit; 25 using namespace Dali::Toolkit;
@@ -138,8 +137,8 @@ public: @@ -138,8 +137,8 @@ public:
138 // Create a flex direction toggle button. (left of toolbar) 137 // Create a flex direction toggle button. (left of toolbar)
139 mFlexDirectionButton = Toolkit::PushButton::New(); 138 mFlexDirectionButton = Toolkit::PushButton::New();
140 mFlexDirectionButton.SetName("mFlexDirectionButton"); 139 mFlexDirectionButton.SetName("mFlexDirectionButton");
141 - mFlexDirectionButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, DEMO_IMAGE_DIR "icon-change.png" );  
142 - mFlexDirectionButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, DEMO_IMAGE_DIR "icon-change-selected.png" ); 140 + mFlexDirectionButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, DEMO_IMAGE_DIR "icon-change.png" );
  141 + mFlexDirectionButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, DEMO_IMAGE_DIR "icon-change-selected.png" );
143 mFlexDirectionButton.ClickedSignal().Connect( this, &FlexContainerExample::OnFlexDirectionButtonClicked); 142 mFlexDirectionButton.ClickedSignal().Connect( this, &FlexContainerExample::OnFlexDirectionButtonClicked);
144 mFlexDirectionButton.SetLeaveRequired( true ); 143 mFlexDirectionButton.SetLeaveRequired( true );
145 mToolBar.AddControl( mFlexDirectionButton, VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalLeft, DemoHelper::DEFAULT_MODE_SWITCH_PADDING ); 144 mToolBar.AddControl( mFlexDirectionButton, VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalLeft, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
@@ -147,8 +146,8 @@ public: @@ -147,8 +146,8 @@ public:
147 // Create a flex wrap toggle button. (left of toolbar) 146 // Create a flex wrap toggle button. (left of toolbar)
148 mFlexWrapButton = Toolkit::PushButton::New(); 147 mFlexWrapButton = Toolkit::PushButton::New();
149 mFlexWrapButton.SetName("mFlexWrapButton"); 148 mFlexWrapButton.SetName("mFlexWrapButton");
150 - mFlexWrapButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, DEMO_IMAGE_DIR "icon-edit.png" );  
151 - mFlexWrapButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, DEMO_IMAGE_DIR "icon-edit-selected.png" ); 149 + mFlexWrapButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, DEMO_IMAGE_DIR "icon-edit.png" );
  150 + mFlexWrapButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, DEMO_IMAGE_DIR "icon-edit-selected.png" );
152 mFlexWrapButton.ClickedSignal().Connect( this, &FlexContainerExample::OnFlexWrapButtonClicked); 151 mFlexWrapButton.ClickedSignal().Connect( this, &FlexContainerExample::OnFlexWrapButtonClicked);
153 mFlexWrapButton.SetLeaveRequired( true ); 152 mFlexWrapButton.SetLeaveRequired( true );
154 mToolBar.AddControl( mFlexWrapButton, VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalLeft, DemoHelper::DEFAULT_MODE_SWITCH_PADDING ); 153 mToolBar.AddControl( mFlexWrapButton, VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalLeft, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
@@ -156,8 +155,8 @@ public: @@ -156,8 +155,8 @@ public:
156 // Create a content direction toggle button. (left of toolbar) 155 // Create a content direction toggle button. (left of toolbar)
157 mContentDirectionButton = Toolkit::PushButton::New(); 156 mContentDirectionButton = Toolkit::PushButton::New();
158 mContentDirectionButton.SetName("mContentDirectionButton"); 157 mContentDirectionButton.SetName("mContentDirectionButton");
159 - mContentDirectionButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, DEMO_IMAGE_DIR "icon-replace.png" );  
160 - mContentDirectionButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, DEMO_IMAGE_DIR "icon-replace-selected.png" ); 158 + mContentDirectionButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, DEMO_IMAGE_DIR "icon-replace.png" );
  159 + mContentDirectionButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, DEMO_IMAGE_DIR "icon-replace-selected.png" );
161 mContentDirectionButton.ClickedSignal().Connect( this, &FlexContainerExample::OnContentDirectionButtonClicked); 160 mContentDirectionButton.ClickedSignal().Connect( this, &FlexContainerExample::OnContentDirectionButtonClicked);
162 mContentDirectionButton.SetLeaveRequired( true ); 161 mContentDirectionButton.SetLeaveRequired( true );
163 mToolBar.AddControl( mContentDirectionButton, VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalLeft, DemoHelper::DEFAULT_MODE_SWITCH_PADDING ); 162 mToolBar.AddControl( mContentDirectionButton, VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalLeft, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
@@ -165,8 +164,8 @@ public: @@ -165,8 +164,8 @@ public:
165 // Create a justify content toggle button. (right of toolbar) 164 // Create a justify content toggle button. (right of toolbar)
166 mJustifyContentButton = Toolkit::PushButton::New(); 165 mJustifyContentButton = Toolkit::PushButton::New();
167 mJustifyContentButton.SetName("mJustifyContentButton"); 166 mJustifyContentButton.SetName("mJustifyContentButton");
168 - mJustifyContentButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, DEMO_IMAGE_DIR "icon-reset.png" );  
169 - mJustifyContentButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, DEMO_IMAGE_DIR "icon-reset-selected.png" ); 167 + mJustifyContentButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, DEMO_IMAGE_DIR "icon-reset.png" );
  168 + mJustifyContentButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, DEMO_IMAGE_DIR "icon-reset-selected.png" );
170 mJustifyContentButton.ClickedSignal().Connect( this, &FlexContainerExample::OnJustifyContentButtonClicked); 169 mJustifyContentButton.ClickedSignal().Connect( this, &FlexContainerExample::OnJustifyContentButtonClicked);
171 mJustifyContentButton.SetLeaveRequired( true ); 170 mJustifyContentButton.SetLeaveRequired( true );
172 mToolBar.AddControl( mJustifyContentButton, VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING ); 171 mToolBar.AddControl( mJustifyContentButton, VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
@@ -174,8 +173,8 @@ public: @@ -174,8 +173,8 @@ public:
174 // Create a align items toggle button. (right of toolbar) 173 // Create a align items toggle button. (right of toolbar)
175 mAlignItemsButton = Toolkit::PushButton::New(); 174 mAlignItemsButton = Toolkit::PushButton::New();
176 mAlignItemsButton.SetName("mAlignItemsButton"); 175 mAlignItemsButton.SetName("mAlignItemsButton");
177 - mAlignItemsButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, DEMO_IMAGE_DIR "icon-highp.png" );  
178 - mAlignItemsButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, DEMO_IMAGE_DIR "icon-highp-selected.png" ); 176 + mAlignItemsButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, DEMO_IMAGE_DIR "icon-highp.png" );
  177 + mAlignItemsButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, DEMO_IMAGE_DIR "icon-highp-selected.png" );
179 mAlignItemsButton.ClickedSignal().Connect( this, &FlexContainerExample::OnAlignItemsButtonClicked); 178 mAlignItemsButton.ClickedSignal().Connect( this, &FlexContainerExample::OnAlignItemsButtonClicked);
180 mAlignItemsButton.SetLeaveRequired( true ); 179 mAlignItemsButton.SetLeaveRequired( true );
181 mToolBar.AddControl( mAlignItemsButton, VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING ); 180 mToolBar.AddControl( mAlignItemsButton, VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
@@ -183,8 +182,8 @@ public: @@ -183,8 +182,8 @@ public:
183 // Create a align content toggle button. (right of toolbar) 182 // Create a align content toggle button. (right of toolbar)
184 mAlignContentButton = Toolkit::PushButton::New(); 183 mAlignContentButton = Toolkit::PushButton::New();
185 mAlignContentButton.SetName("mAlignContentButton"); 184 mAlignContentButton.SetName("mAlignContentButton");
186 - mAlignContentButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, DEMO_IMAGE_DIR "icon-effect-cross.png" );  
187 - mAlignContentButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, DEMO_IMAGE_DIR "icon-effect-cross-selected.png" ); 185 + mAlignContentButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, DEMO_IMAGE_DIR "icon-effect-cross.png" );
  186 + mAlignContentButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, DEMO_IMAGE_DIR "icon-effect-cross-selected.png" );
188 mAlignContentButton.ClickedSignal().Connect( this, &FlexContainerExample::OnAlignContentButtonClicked); 187 mAlignContentButton.ClickedSignal().Connect( this, &FlexContainerExample::OnAlignContentButtonClicked);
189 mAlignContentButton.SetLeaveRequired( true ); 188 mAlignContentButton.SetLeaveRequired( true );
190 mToolBar.AddControl( mAlignContentButton, VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING ); 189 mToolBar.AddControl( mAlignContentButton, VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
@@ -225,8 +224,8 @@ public: @@ -225,8 +224,8 @@ public:
225 224
226 // Set different background colour to help to identify different items 225 // Set different background colour to help to identify different items
227 flexItem.SetBackgroundColor(Vector4(static_cast<float>(i) / NUM_FLEX_ITEMS, static_cast<float>(NUM_FLEX_ITEMS - i) / NUM_FLEX_ITEMS, 1.0f, 1.0f)); 226 flexItem.SetBackgroundColor(Vector4(static_cast<float>(i) / NUM_FLEX_ITEMS, static_cast<float>(NUM_FLEX_ITEMS - i) / NUM_FLEX_ITEMS, 1.0f, 1.0f));
228 - flexItem.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, "" );  
229 - flexItem.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, "" ); 227 + flexItem.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, "" );
  228 + flexItem.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, "" );
230 229
231 // Add a label to the button so that we can identify each item more easily 230 // Add a label to the button so that we can identify each item more easily
232 std::ostringstream index; 231 std::ostringstream index;
examples/gradients/gradients-example.cpp
  View file @6982eca
1 /* 1 /*
2 - * Copyright (c) 2017 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2019 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@ @@ -16,7 +16,6 @@
16 */ 16 */
17 17
18 #include <dali-toolkit/dali-toolkit.h> 18 #include <dali-toolkit/dali-toolkit.h>
19 -#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>  
20 #include "shared/view.h" 19 #include "shared/view.h"
21 20
22 using namespace Dali; 21 using namespace Dali;
@@ -68,8 +67,8 @@ public: @@ -68,8 +67,8 @@ public:
68 APPLICATION_TITLE ); 67 APPLICATION_TITLE );
69 68
70 PushButton changeButton = Toolkit::PushButton::New(); 69 PushButton changeButton = Toolkit::PushButton::New();
71 - changeButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, CHANGE_ICON );  
72 - changeButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, CHANGE_ICON_SELECTED ); 70 + changeButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, CHANGE_ICON );
  71 + changeButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, CHANGE_ICON_SELECTED );
73 changeButton.ClickedSignal().Connect( this, &GradientController::OnChangeIconClicked ); 72 changeButton.ClickedSignal().Connect( this, &GradientController::OnChangeIconClicked );
74 toolBar.AddControl( changeButton, 73 toolBar.AddControl( changeButton,
75 DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, 74 DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage,
examples/image-policies/image-policies-example.cpp
  View file @6982eca
1 /* 1 /*
2 - * Copyright (c) 2017 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2019 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@ @@ -23,7 +23,6 @@
23 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h> 23 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
24 #include <dali-toolkit/devel-api/visual-factory/visual-base.h> 24 #include <dali-toolkit/devel-api/visual-factory/visual-base.h>
25 #include <dali-toolkit/devel-api/visuals/image-visual-properties-devel.h> 25 #include <dali-toolkit/devel-api/visuals/image-visual-properties-devel.h>
26 -#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>  
27 26
28 using namespace Dali; 27 using namespace Dali;
29 using namespace Toolkit; 28 using namespace Toolkit;
@@ -409,13 +408,13 @@ class ImagePolicies: public ConnectionTracker @@ -409,13 +408,13 @@ class ImagePolicies: public ConnectionTracker
409 Property::Map imagePropertyMap; 408 Property::Map imagePropertyMap;
410 imagePropertyMap.Insert( Visual::Property::TYPE, Visual::IMAGE ); 409 imagePropertyMap.Insert( Visual::Property::TYPE, Visual::IMAGE );
411 imagePropertyMap.Insert( ImageVisual::Property::URL, NEXT_BUTTON_IMAGE ); 410 imagePropertyMap.Insert( ImageVisual::Property::URL, NEXT_BUTTON_IMAGE );
412 - mNextButton.SetProperty( DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, imagePropertyMap ); 411 + mNextButton.SetProperty( Button::Property::UNSELECTED_BACKGROUND_VISUAL, imagePropertyMap );
413 imagePropertyMap.Clear(); 412 imagePropertyMap.Clear();
414 imagePropertyMap.Insert( Visual::Property::TYPE, Visual::IMAGE ); 413 imagePropertyMap.Insert( Visual::Property::TYPE, Visual::IMAGE );
415 imagePropertyMap.Insert( ImageVisual::Property::URL, NEXT_BUTTON_PRESSED_IMAGE ); 414 imagePropertyMap.Insert( ImageVisual::Property::URL, NEXT_BUTTON_PRESSED_IMAGE );
416 - mNextButton.SetProperty( DevelButton::Property::SELECTED_BACKGROUND_VISUAL, imagePropertyMap );  
417 - mNextButton.SetProperty( DevelButton::Property::DISABLED_UNSELECTED_BACKGROUND_VISUAL, LOADING_IMAGE );  
418 - mNextButton.SetProperty( DevelButton::Property::DISABLED_SELECTED_BACKGROUND_VISUAL, NEXT_BUTTON_DISABLED_IMAGE ); 415 + mNextButton.SetProperty( Button::Property::SELECTED_BACKGROUND_VISUAL, imagePropertyMap );
  416 + mNextButton.SetProperty( Button::Property::DISABLED_UNSELECTED_BACKGROUND_VISUAL, LOADING_IMAGE );
  417 + mNextButton.SetProperty( Button::Property::DISABLED_SELECTED_BACKGROUND_VISUAL, NEXT_BUTTON_DISABLED_IMAGE );
419 mNextButton.SetParentOrigin( ParentOrigin::BOTTOM_CENTER ); 418 mNextButton.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
420 mNextButton.SetY( -50.0f ); 419 mNextButton.SetY( -50.0f );
421 mNextButton.SetSize( 100.0f, 100.0f ); 420 mNextButton.SetSize( 100.0f, 100.0f );
@@ -507,8 +506,8 @@ private: @@ -507,8 +506,8 @@ private:
507 { 506 {
508 ReleasePolicyDestroyedExample06(); 507 ReleasePolicyDestroyedExample06();
509 // Change Next button to complete button ( will quit app once pressed ) 508 // Change Next button to complete button ( will quit app once pressed )
510 - button.SetProperty( DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, OK_IMAGE_IMAGE );  
511 - button.SetProperty( DevelButton::Property::SELECTED_BACKGROUND_VISUAL, OK_IMAGE_IMAGE ); 509 + button.SetProperty( Button::Property::UNSELECTED_BACKGROUND_VISUAL, OK_IMAGE_IMAGE );
  510 + button.SetProperty( Button::Property::SELECTED_BACKGROUND_VISUAL, OK_IMAGE_IMAGE );
512 break; 511 break;
513 } 512 }
514 default: 513 default:
examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp
  View file @6982eca
1 /* 1 /*
2 - * Copyright (c) 2017 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2019 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -45,7 +45,6 @@ @@ -45,7 +45,6 @@
45 #include <algorithm> 45 #include <algorithm>
46 #include <map> 46 #include <map>
47 #include <dali-toolkit/dali-toolkit.h> 47 #include <dali-toolkit/dali-toolkit.h>
48 -#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>  
49 #include <iostream> 48 #include <iostream>
50 #include <dali-toolkit/devel-api/controls/control-devel.h> 49 #include <dali-toolkit/devel-api/controls/control-devel.h>
51 50
@@ -316,8 +315,8 @@ public: @@ -316,8 +315,8 @@ public:
316 315
317 // Create an image scaling toggle button. (right of toolbar) 316 // Create an image scaling toggle button. (right of toolbar)
318 Toolkit::PushButton toggleScalingButton = Toolkit::PushButton::New(); 317 Toolkit::PushButton toggleScalingButton = Toolkit::PushButton::New();
319 - toggleScalingButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, TOGGLE_SCALING_IMAGE );  
320 - toggleScalingButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, TOGGLE_SCALING_IMAGE_SELECTED ); 318 + toggleScalingButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, TOGGLE_SCALING_IMAGE );
  319 + toggleScalingButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, TOGGLE_SCALING_IMAGE_SELECTED );
321 toggleScalingButton.ClickedSignal().Connect( this, &ImageScalingIrregularGridController::OnToggleScalingTouched ); 320 toggleScalingButton.ClickedSignal().Connect( this, &ImageScalingIrregularGridController::OnToggleScalingTouched );
322 mToolBar.AddControl( toggleScalingButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING ); 321 mToolBar.AddControl( toggleScalingButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
323 322
examples/image-view-pixel-area/image-view-pixel-area-example.cpp
  View file @6982eca
1 /* 1 /*
2 - * Copyright (c) 2017 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2019 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@ @@ -16,7 +16,6 @@
16 */ 16 */
17 17
18 #include <dali-toolkit/dali-toolkit.h> 18 #include <dali-toolkit/dali-toolkit.h>
19 -#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>  
20 19
21 #include "shared/view.h" 20 #include "shared/view.h"
22 21
@@ -71,8 +70,8 @@ private: @@ -71,8 +70,8 @@ private:
71 70
72 // Add a button to switch the scene. (right of toolbar) 71 // Add a button to switch the scene. (right of toolbar)
73 Toolkit::PushButton switchButton = Toolkit::PushButton::New(); 72 Toolkit::PushButton switchButton = Toolkit::PushButton::New();
74 - switchButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, BUTTON_ICON );  
75 - switchButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, BUTTON_ICON_SELECTED ); 73 + switchButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, BUTTON_ICON );
  74 + switchButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, BUTTON_ICON_SELECTED );
76 switchButton.ClickedSignal().Connect( this, &ImageViewPixelAreaApp::OnButtonClicked ); 75 switchButton.ClickedSignal().Connect( this, &ImageViewPixelAreaApp::OnButtonClicked );
77 toolBar.AddControl( switchButton, 76 toolBar.AddControl( switchButton,
78 DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, 77 DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage,
examples/image-view-url/image-view-url-example.cpp
  View file @6982eca
1 /* 1 /*
2 - * Copyright (c) 2017 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2019 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@ @@ -16,7 +16,6 @@
16 */ 16 */
17 17
18 #include <dali-toolkit/dali-toolkit.h> 18 #include <dali-toolkit/dali-toolkit.h>
19 -#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>  
20 #include <dali-toolkit/devel-api/image-loader/texture-manager.h> 19 #include <dali-toolkit/devel-api/image-loader/texture-manager.h>
21 20
22 #include "shared/view.h" 21 #include "shared/view.h"
@@ -88,8 +87,8 @@ private: @@ -88,8 +87,8 @@ private:
88 87
89 // Add a button to switch the scene. (right of toolbar) 88 // Add a button to switch the scene. (right of toolbar)
90 Toolkit::PushButton switchButton = Toolkit::PushButton::New(); 89 Toolkit::PushButton switchButton = Toolkit::PushButton::New();
91 - switchButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, BUTTON_ICON );  
92 - switchButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, BUTTON_ICON_SELECTED ); 90 + switchButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, BUTTON_ICON );
  91 + switchButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, BUTTON_ICON_SELECTED );
93 switchButton.ClickedSignal().Connect( this, &ImageViewUrlApp::OnButtonClicked ); 92 switchButton.ClickedSignal().Connect( this, &ImageViewUrlApp::OnButtonClicked );
94 toolBar.AddControl( switchButton, 93 toolBar.AddControl( switchButton,
95 DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, 94 DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage,
examples/item-view/item-view-example.cpp
  View file @6982eca
1 /* 1 /*
2 - * Copyright (c) 2018 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2019 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@ @@ -20,7 +20,6 @@
20 20
21 #include <dali/dali.h> 21 #include <dali/dali.h>
22 #include <dali-toolkit/dali-toolkit.h> 22 #include <dali-toolkit/dali-toolkit.h>
23 -#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>  
24 #include <dali-toolkit/devel-api/visuals/visual-properties-devel.h> 23 #include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
25 24
26 using namespace Dali; 25 using namespace Dali;
@@ -215,16 +214,16 @@ public: @@ -215,16 +214,16 @@ public:
215 214
216 // Create an edit mode button. (left of toolbar) 215 // Create an edit mode button. (left of toolbar)
217 Toolkit::PushButton editButton = Toolkit::PushButton::New(); 216 Toolkit::PushButton editButton = Toolkit::PushButton::New();
218 - editButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, EDIT_IMAGE );  
219 - editButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, EDIT_IMAGE_SELECTED ); 217 + editButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, EDIT_IMAGE );
  218 + editButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, EDIT_IMAGE_SELECTED );
220 editButton.ClickedSignal().Connect( this, &ItemViewExample::OnModeButtonClicked); 219 editButton.ClickedSignal().Connect( this, &ItemViewExample::OnModeButtonClicked);
221 editButton.SetLeaveRequired( true ); 220 editButton.SetLeaveRequired( true );
222 mToolBar.AddControl( editButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalLeft, DemoHelper::DEFAULT_MODE_SWITCH_PADDING ); 221 mToolBar.AddControl( editButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalLeft, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
223 222
224 // Create a layout toggle button. (right of toolbar) 223 // Create a layout toggle button. (right of toolbar)
225 mLayoutButton = Toolkit::PushButton::New(); 224 mLayoutButton = Toolkit::PushButton::New();
226 - mLayoutButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, SPIRAL_LAYOUT_IMAGE );  
227 - mLayoutButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, SPIRAL_LAYOUT_IMAGE_SELECTED ); 225 + mLayoutButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, SPIRAL_LAYOUT_IMAGE );
  226 + mLayoutButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, SPIRAL_LAYOUT_IMAGE_SELECTED );
228 mLayoutButton.ClickedSignal().Connect( this, &ItemViewExample::OnLayoutButtonClicked); 227 mLayoutButton.ClickedSignal().Connect( this, &ItemViewExample::OnLayoutButtonClicked);
229 mLayoutButton.SetLeaveRequired( true ); 228 mLayoutButton.SetLeaveRequired( true );
230 mToolBar.AddControl( mLayoutButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING ); 229 mToolBar.AddControl( mLayoutButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
@@ -235,8 +234,8 @@ public: @@ -235,8 +234,8 @@ public:
235 mDeleteButton.SetAnchorPoint(AnchorPoint::BOTTOM_RIGHT); 234 mDeleteButton.SetAnchorPoint(AnchorPoint::BOTTOM_RIGHT);
236 mDeleteButton.SetPosition( BUTTON_BORDER, BUTTON_BORDER ); 235 mDeleteButton.SetPosition( BUTTON_BORDER, BUTTON_BORDER );
237 mDeleteButton.SetDrawMode( DrawMode::OVERLAY_2D ); 236 mDeleteButton.SetDrawMode( DrawMode::OVERLAY_2D );
238 - mDeleteButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, DELETE_IMAGE );  
239 - mDeleteButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, DELETE_IMAGE_SELECTED ); 237 + mDeleteButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, DELETE_IMAGE );
  238 + mDeleteButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, DELETE_IMAGE_SELECTED );
240 mDeleteButton.SetProperty( Toolkit::Control::Property::BACKGROUND, TOOLBAR_IMAGE ); 239 mDeleteButton.SetProperty( Toolkit::Control::Property::BACKGROUND, TOOLBAR_IMAGE );
241 mDeleteButton.SetSize( Vector2( stageSize.width * 0.15f, stageSize.width * 0.15f ) ); 240 mDeleteButton.SetSize( Vector2( stageSize.width * 0.15f, stageSize.width * 0.15f ) );
242 mDeleteButton.ClickedSignal().Connect( this, &ItemViewExample::OnDeleteButtonClicked); 241 mDeleteButton.ClickedSignal().Connect( this, &ItemViewExample::OnDeleteButtonClicked);
@@ -250,8 +249,8 @@ public: @@ -250,8 +249,8 @@ public:
250 mInsertButton.SetAnchorPoint(AnchorPoint::BOTTOM_RIGHT); 249 mInsertButton.SetAnchorPoint(AnchorPoint::BOTTOM_RIGHT);
251 mInsertButton.SetPosition( BUTTON_BORDER, BUTTON_BORDER ); 250 mInsertButton.SetPosition( BUTTON_BORDER, BUTTON_BORDER );
252 mInsertButton.SetDrawMode( DrawMode::OVERLAY_2D ); 251 mInsertButton.SetDrawMode( DrawMode::OVERLAY_2D );
253 - mInsertButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, INSERT_IMAGE );  
254 - mInsertButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, INSERT_IMAGE_SELECTED ); 252 + mInsertButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, INSERT_IMAGE );
  253 + mInsertButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, INSERT_IMAGE_SELECTED );
255 mInsertButton.SetProperty( Toolkit::Control::Property::BACKGROUND, TOOLBAR_IMAGE ); 254 mInsertButton.SetProperty( Toolkit::Control::Property::BACKGROUND, TOOLBAR_IMAGE );
256 mInsertButton.SetSize( stageSize.width * 0.15f, stageSize.width * 0.15f ); 255 mInsertButton.SetSize( stageSize.width * 0.15f, stageSize.width * 0.15f );
257 mInsertButton.ClickedSignal().Connect( this, &ItemViewExample::OnInsertButtonClicked); 256 mInsertButton.ClickedSignal().Connect( this, &ItemViewExample::OnInsertButtonClicked);
@@ -265,8 +264,8 @@ public: @@ -265,8 +264,8 @@ public:
265 mReplaceButton.SetAnchorPoint(AnchorPoint::BOTTOM_RIGHT); 264 mReplaceButton.SetAnchorPoint(AnchorPoint::BOTTOM_RIGHT);
266 mReplaceButton.SetPosition( BUTTON_BORDER, BUTTON_BORDER ); 265 mReplaceButton.SetPosition( BUTTON_BORDER, BUTTON_BORDER );
267 mReplaceButton.SetDrawMode( DrawMode::OVERLAY_2D ); 266 mReplaceButton.SetDrawMode( DrawMode::OVERLAY_2D );
268 - mReplaceButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, REPLACE_IMAGE );  
269 - mReplaceButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, REPLACE_IMAGE_SELECTED ); 267 + mReplaceButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, REPLACE_IMAGE );
  268 + mReplaceButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, REPLACE_IMAGE_SELECTED );
270 mReplaceButton.SetProperty( Toolkit::Control::Property::BACKGROUND, TOOLBAR_IMAGE ); 269 mReplaceButton.SetProperty( Toolkit::Control::Property::BACKGROUND, TOOLBAR_IMAGE );
271 mReplaceButton.SetSize( stageSize.width * 0.15f, stageSize.width * 0.15f ); 270 mReplaceButton.SetSize( stageSize.width * 0.15f, stageSize.width * 0.15f );
272 mReplaceButton.ClickedSignal().Connect( this, &ItemViewExample::OnReplaceButtonClicked); 271 mReplaceButton.ClickedSignal().Connect( this, &ItemViewExample::OnReplaceButtonClicked);
@@ -823,22 +822,22 @@ public: @@ -823,22 +822,22 @@ public:
823 { 822 {
824 case SPIRAL_LAYOUT: 823 case SPIRAL_LAYOUT:
825 { 824 {
826 - mLayoutButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, SPIRAL_LAYOUT_IMAGE );  
827 - mLayoutButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, SPIRAL_LAYOUT_IMAGE_SELECTED ); 825 + mLayoutButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, SPIRAL_LAYOUT_IMAGE );
  826 + mLayoutButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, SPIRAL_LAYOUT_IMAGE_SELECTED );
828 break; 827 break;
829 } 828 }
830 829
831 case GRID_LAYOUT: 830 case GRID_LAYOUT:
832 { 831 {
833 - mLayoutButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, GRID_LAYOUT_IMAGE );  
834 - mLayoutButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, GRID_LAYOUT_IMAGE_SELECTED ); 832 + mLayoutButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, GRID_LAYOUT_IMAGE );
  833 + mLayoutButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, GRID_LAYOUT_IMAGE_SELECTED );
835 break; 834 break;
836 } 835 }
837 836
838 case DEPTH_LAYOUT: 837 case DEPTH_LAYOUT:
839 { 838 {
840 - mLayoutButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, DEPTH_LAYOUT_IMAGE );  
841 - mLayoutButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, DEPTH_LAYOUT_IMAGE_SELECTED ); 839 + mLayoutButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, DEPTH_LAYOUT_IMAGE );
  840 + mLayoutButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, DEPTH_LAYOUT_IMAGE_SELECTED );
842 break; 841 break;
843 } 842 }
844 843
examples/motion-blur/motion-blur-example.cpp
  View file @6982eca
1 /* 1 /*
2 - * Copyright (c) 2018 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2019 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@ @@ -21,7 +21,6 @@
21 #include "shared/view.h" 21 #include "shared/view.h"
22 #include <dali/dali.h> 22 #include <dali/dali.h>
23 #include <dali-toolkit/dali-toolkit.h> 23 #include <dali-toolkit/dali-toolkit.h>
24 -#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>  
25 #include <dali-toolkit/devel-api/shader-effects/motion-blur-effect.h> 24 #include <dali-toolkit/devel-api/shader-effects/motion-blur-effect.h>
26 25
27 using namespace Dali; 26 using namespace Dali;
@@ -169,16 +168,16 @@ public: @@ -169,16 +168,16 @@ public:
169 168
170 //Add an effects icon on the right of the title 169 //Add an effects icon on the right of the title
171 mActorEffectsButton = Toolkit::PushButton::New(); 170 mActorEffectsButton = Toolkit::PushButton::New();
172 - mActorEffectsButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, EFFECTS_OFF_ICON );  
173 - mActorEffectsButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, EFFECTS_OFF_ICON_SELECTED ); 171 + mActorEffectsButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, EFFECTS_OFF_ICON );
  172 + mActorEffectsButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, EFFECTS_OFF_ICON_SELECTED );
174 mActorEffectsButton.ClickedSignal().Connect( this, &MotionBlurExampleApp::OnEffectButtonClicked ); 173 mActorEffectsButton.ClickedSignal().Connect( this, &MotionBlurExampleApp::OnEffectButtonClicked );
175 mToolBar.AddControl( mActorEffectsButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalCenter, DemoHelper::DEFAULT_PLAY_PADDING ); 174 mToolBar.AddControl( mActorEffectsButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalCenter, DemoHelper::DEFAULT_PLAY_PADDING );
176 175
177 // Creates a mode button. 176 // Creates a mode button.
178 // Create a effect toggle button. (right of toolbar) 177 // Create a effect toggle button. (right of toolbar)
179 Toolkit::PushButton layoutButton = Toolkit::PushButton::New(); 178 Toolkit::PushButton layoutButton = Toolkit::PushButton::New();
180 - layoutButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, LAYOUT_IMAGE );  
181 - layoutButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, LAYOUT_IMAGE_SELECTED ); 179 + layoutButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, LAYOUT_IMAGE );
  180 + layoutButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, LAYOUT_IMAGE_SELECTED );
182 layoutButton.ClickedSignal().Connect( this, &MotionBlurExampleApp::OnLayoutButtonClicked); 181 layoutButton.ClickedSignal().Connect( this, &MotionBlurExampleApp::OnLayoutButtonClicked);
183 layoutButton.SetLeaveRequired( true ); 182 layoutButton.SetLeaveRequired( true );
184 mToolBar.AddControl( layoutButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING ); 183 mToolBar.AddControl( layoutButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
@@ -363,14 +362,14 @@ public: @@ -363,14 +362,14 @@ public:
363 if(!mActorEffectsEnabled) 362 if(!mActorEffectsEnabled)
364 { 363 {
365 mActorEffectsEnabled = true; 364 mActorEffectsEnabled = true;
366 - mActorEffectsButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, EFFECTS_ON_ICON );  
367 - mActorEffectsButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, EFFECTS_ON_ICON_SELECTED ); 365 + mActorEffectsButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, EFFECTS_ON_ICON );
  366 + mActorEffectsButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, EFFECTS_ON_ICON_SELECTED );
368 } 367 }
369 else 368 else
370 { 369 {
371 mActorEffectsEnabled = false; 370 mActorEffectsEnabled = false;
372 - mActorEffectsButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, EFFECTS_OFF_ICON );  
373 - mActorEffectsButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, EFFECTS_OFF_ICON_SELECTED ); 371 + mActorEffectsButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, EFFECTS_OFF_ICON );
  372 + mActorEffectsButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, EFFECTS_OFF_ICON_SELECTED );
374 } 373 }
375 } 374 }
376 375
examples/motion-stretch/motion-stretch-example.cpp
  View file @6982eca
1 /* 1 /*
2 - * Copyright (c) 2018 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2019 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@ @@ -21,7 +21,6 @@
21 #include "shared/view.h" 21 #include "shared/view.h"
22 #include <dali/dali.h> 22 #include <dali/dali.h>
23 #include <dali-toolkit/dali-toolkit.h> 23 #include <dali-toolkit/dali-toolkit.h>
24 -#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>  
25 #include <dali-toolkit/devel-api/shader-effects/motion-stretch-effect.h> 24 #include <dali-toolkit/devel-api/shader-effects/motion-stretch-effect.h>
26 25
27 using namespace Dali; 26 using namespace Dali;
@@ -148,16 +147,16 @@ public: @@ -148,16 +147,16 @@ public:
148 147
149 //Add an slideshow icon on the right of the title 148 //Add an slideshow icon on the right of the title
150 mActorEffectsButton = Toolkit::PushButton::New(); 149 mActorEffectsButton = Toolkit::PushButton::New();
151 - mActorEffectsButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, EFFECTS_OFF_ICON );  
152 - mActorEffectsButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, EFFECTS_OFF_ICON_SELECTED ); 150 + mActorEffectsButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, EFFECTS_OFF_ICON );
  151 + mActorEffectsButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, EFFECTS_OFF_ICON_SELECTED );
153 mActorEffectsButton.ClickedSignal().Connect( this, &MotionStretchExampleApp::OnEffectButtonClicked ); 152 mActorEffectsButton.ClickedSignal().Connect( this, &MotionStretchExampleApp::OnEffectButtonClicked );
154 mToolBar.AddControl( mActorEffectsButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalCenter, DemoHelper::DEFAULT_PLAY_PADDING ); 153 mToolBar.AddControl( mActorEffectsButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalCenter, DemoHelper::DEFAULT_PLAY_PADDING );
155 154
156 // Creates a mode button. 155 // Creates a mode button.
157 // Create a effect toggle button. (right of toolbar) 156 // Create a effect toggle button. (right of toolbar)
158 Toolkit::PushButton layoutButton = Toolkit::PushButton::New(); 157 Toolkit::PushButton layoutButton = Toolkit::PushButton::New();
159 - layoutButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, LAYOUT_IMAGE );  
160 - layoutButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, LAYOUT_IMAGE_SELECTED ); 158 + layoutButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, LAYOUT_IMAGE );
  159 + layoutButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, LAYOUT_IMAGE_SELECTED );
161 layoutButton.ClickedSignal().Connect( this, &MotionStretchExampleApp::OnLayoutButtonClicked); 160 layoutButton.ClickedSignal().Connect( this, &MotionStretchExampleApp::OnLayoutButtonClicked);
162 layoutButton.SetLeaveRequired( true ); 161 layoutButton.SetLeaveRequired( true );
163 mToolBar.AddControl( layoutButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING ); 162 mToolBar.AddControl( layoutButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
@@ -335,14 +334,14 @@ public: @@ -335,14 +334,14 @@ public:
335 if(!mActorEffectsEnabled) 334 if(!mActorEffectsEnabled)
336 { 335 {
337 mActorEffectsEnabled = true; 336 mActorEffectsEnabled = true;
338 - mActorEffectsButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, EFFECTS_ON_ICON );  
339 - mActorEffectsButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, EFFECTS_ON_ICON_SELECTED ); 337 + mActorEffectsButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, EFFECTS_ON_ICON );
  338 + mActorEffectsButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, EFFECTS_ON_ICON_SELECTED );
340 } 339 }
341 else 340 else
342 { 341 {
343 mActorEffectsEnabled = false; 342 mActorEffectsEnabled = false;
344 - mActorEffectsButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, EFFECTS_OFF_ICON );  
345 - mActorEffectsButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, EFFECTS_OFF_ICON_SELECTED ); 343 + mActorEffectsButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, EFFECTS_OFF_ICON );
  344 + mActorEffectsButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, EFFECTS_OFF_ICON_SELECTED );
346 } 345 }
347 } 346 }
348 347
examples/popup/popup-example.cpp
  View file @6982eca
1 /* 1 /*
2 - * Copyright (c) 2017 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2019 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@ @@ -18,7 +18,6 @@
18 #include "shared/view.h" 18 #include "shared/view.h"
19 #include <dali/dali.h> 19 #include <dali/dali.h>
20 #include <dali-toolkit/dali-toolkit.h> 20 #include <dali-toolkit/dali-toolkit.h>
21 -#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>  
22 #include <dali-toolkit/devel-api/controls/popup/popup.h> 21 #include <dali-toolkit/devel-api/controls/popup/popup.h>
23 22
24 using namespace Dali; 23 using namespace Dali;
@@ -136,16 +135,16 @@ public: @@ -136,16 +135,16 @@ public:
136 135
137 // Create animation button. 136 // Create animation button.
138 mAnimationButton = Toolkit::PushButton::New(); 137 mAnimationButton = Toolkit::PushButton::New();
139 - mAnimationButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, ANIMATION_FADE_ICON_IMAGE );  
140 - mAnimationButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, ANIMATION_ZOOM_ICON_IMAGE ); 138 + mAnimationButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, ANIMATION_FADE_ICON_IMAGE );
  139 + mAnimationButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, ANIMATION_ZOOM_ICON_IMAGE );
141 mAnimationButton.SetProperty( Toolkit::Button::Property::TOGGLABLE, true ); 140 mAnimationButton.SetProperty( Toolkit::Button::Property::TOGGLABLE, true );
142 mAnimationButton.ClickedSignal().Connect( this, &PopupExample::OnAnimationClicked ); 141 mAnimationButton.ClickedSignal().Connect( this, &PopupExample::OnAnimationClicked );
143 mToolBar.AddControl( mAnimationButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalLeft, DemoHelper::DEFAULT_MODE_SWITCH_PADDING ); 142 mToolBar.AddControl( mAnimationButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalLeft, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
144 143
145 // Create context button. 144 // Create context button.
146 mContextButton = Toolkit::PushButton::New(); 145 mContextButton = Toolkit::PushButton::New();
147 - mContextButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, CONTEXT_DISABLED_ICON_IMAGE );  
148 - mContextButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, CONTEXT_ENABLED_ICON_IMAGE ); 146 + mContextButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, CONTEXT_DISABLED_ICON_IMAGE );
  147 + mContextButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, CONTEXT_ENABLED_ICON_IMAGE );
149 mContextButton.SetProperty( Toolkit::Button::Property::TOGGLABLE, true ); 148 mContextButton.SetProperty( Toolkit::Button::Property::TOGGLABLE, true );
150 mContextButton.ClickedSignal().Connect( this, &PopupExample::OnContextClicked ); 149 mContextButton.ClickedSignal().Connect( this, &PopupExample::OnContextClicked );
151 mToolBar.AddControl( mContextButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalLeft, DemoHelper::DEFAULT_MODE_SWITCH_PADDING ); 150 mToolBar.AddControl( mContextButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalLeft, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
examples/primitive-shapes/primitive-shapes-example.cpp
  View file @6982eca
1 /* 1 /*
2 - * Copyright (c) 2017 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2019 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@ @@ -16,7 +16,6 @@
16 */ 16 */
17 17
18 #include <dali-toolkit/dali-toolkit.h> 18 #include <dali-toolkit/dali-toolkit.h>
19 -#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>  
20 19
21 using namespace Dali; 20 using namespace Dali;
22 using namespace Dali::Toolkit; 21 using namespace Dali::Toolkit;
@@ -186,8 +185,8 @@ public: @@ -186,8 +185,8 @@ public:
186 button.SetAnchorPoint( AnchorPoint::CENTER ); 185 button.SetAnchorPoint( AnchorPoint::CENTER );
187 button.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); 186 button.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
188 button.SetPadding( Padding( elementPadding, elementPadding, elementPadding, elementPadding ) ); 187 button.SetPadding( Padding( elementPadding, elementPadding, elementPadding, elementPadding ) );
189 - button.SetProperty( DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, BUTTON_IMAGE_URL[modelNumber] );  
190 - button.SetProperty( DevelButton::Property::SELECTED_BACKGROUND_VISUAL, BUTTON_IMAGE_URL[modelNumber] ); 188 + button.SetProperty( Button::Property::UNSELECTED_BACKGROUND_VISUAL, BUTTON_IMAGE_URL[modelNumber] );
  189 + button.SetProperty( Button::Property::SELECTED_BACKGROUND_VISUAL, BUTTON_IMAGE_URL[modelNumber] );
191 button.RegisterProperty( "modelNumber", Property::Value( modelNumber ) ); 190 button.RegisterProperty( "modelNumber", Property::Value( modelNumber ) );
192 button.ClickedSignal().Connect( this, &PrimitiveShapesController::OnChangeShapeClicked ); 191 button.ClickedSignal().Connect( this, &PrimitiveShapesController::OnChangeShapeClicked );
193 192
examples/refraction-effect/refraction-effect-example.cpp
  View file @6982eca
@@ -18,7 +18,6 @@ @@ -18,7 +18,6 @@
18 // EXTERNAL INCLUDES 18 // EXTERNAL INCLUDES
19 #include <dali/dali.h> 19 #include <dali/dali.h>
20 #include <dali-toolkit/dali-toolkit.h> 20 #include <dali-toolkit/dali-toolkit.h>
21 -#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>  
22 #include <dali/integration-api/debug.h> 21 #include <dali/integration-api/debug.h>
23 #include <dali/devel-api/adaptor-framework/file-loader.h> 22 #include <dali/devel-api/adaptor-framework/file-loader.h>
24 23
@@ -261,8 +260,8 @@ private: @@ -261,8 +260,8 @@ private:
261 260
262 // Add a button to change background. (right of toolbar) 261 // Add a button to change background. (right of toolbar)
263 mChangeTextureButton = Toolkit::PushButton::New(); 262 mChangeTextureButton = Toolkit::PushButton::New();
264 - mChangeTextureButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, CHANGE_TEXTURE_ICON );  
265 - mChangeTextureButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, CHANGE_TEXTURE_ICON_SELECTED ); 263 + mChangeTextureButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, CHANGE_TEXTURE_ICON );
  264 + mChangeTextureButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, CHANGE_TEXTURE_ICON_SELECTED );
266 mChangeTextureButton.ClickedSignal().Connect( this, &RefractionEffectExample::OnChangeTexture ); 265 mChangeTextureButton.ClickedSignal().Connect( this, &RefractionEffectExample::OnChangeTexture );
267 toolBar.AddControl( mChangeTextureButton, 266 toolBar.AddControl( mChangeTextureButton,
268 DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, 267 DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage,
@@ -270,8 +269,8 @@ private: @@ -270,8 +269,8 @@ private:
270 DemoHelper::DEFAULT_MODE_SWITCH_PADDING ); 269 DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
271 // Add a button to change mesh pattern. ( left of bar ) 270 // Add a button to change mesh pattern. ( left of bar )
272 mChangeMeshButton = Toolkit::PushButton::New(); 271 mChangeMeshButton = Toolkit::PushButton::New();
273 - mChangeMeshButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, CHANGE_MESH_ICON );  
274 - mChangeMeshButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, CHANGE_MESH_ICON_SELECTED ); 272 + mChangeMeshButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, CHANGE_MESH_ICON );
  273 + mChangeMeshButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, CHANGE_MESH_ICON_SELECTED );
275 mChangeMeshButton.ClickedSignal().Connect( this, &RefractionEffectExample::OnChangeMesh ); 274 mChangeMeshButton.ClickedSignal().Connect( this, &RefractionEffectExample::OnChangeMesh );
276 toolBar.AddControl( mChangeMeshButton, 275 toolBar.AddControl( mChangeMeshButton,
277 DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, 276 DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage,
examples/scroll-view/scroll-view-example.cpp
  View file @6982eca
1 /* 1 /*
2 - * Copyright (c) 2017 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2019 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@ @@ -22,7 +22,6 @@
22 #include "shared/view.h" 22 #include "shared/view.h"
23 #include <dali/dali.h> 23 #include <dali/dali.h>
24 #include <dali-toolkit/dali-toolkit.h> 24 #include <dali-toolkit/dali-toolkit.h>
25 -#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>  
26 25
27 using namespace Dali; 26 using namespace Dali;
28 using namespace Dali::Toolkit; 27 using namespace Dali::Toolkit;
@@ -251,8 +250,8 @@ private: @@ -251,8 +250,8 @@ private:
251 ss << APPLICATION_TITLE << ": " << EFFECT_MODE_NAME[mEffectMode]; 250 ss << APPLICATION_TITLE << ": " << EFFECT_MODE_NAME[mEffectMode];
252 SetTitle(ss.str()); 251 SetTitle(ss.str());
253 252
254 - mEffectChangeButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, mEffectIcon[ mEffectMode ] );  
255 - mEffectChangeButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, mEffectIconSelected[ mEffectMode ] ); 253 + mEffectChangeButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, mEffectIcon[ mEffectMode ] );
  254 + mEffectChangeButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, mEffectIconSelected[ mEffectMode ] );
256 255
257 // remove old Effect if exists. 256 // remove old Effect if exists.
258 if(mScrollViewEffect) 257 if(mScrollViewEffect)
examples/shadows-and-lights/shadows-and-lights-example.cpp
  View file @6982eca
1 /* 1 /*
2 - * Copyright (c) 2017 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2019 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@ @@ -20,7 +20,6 @@
20 20
21 #include <dali/dali.h> 21 #include <dali/dali.h>
22 #include <dali-toolkit/dali-toolkit.h> 22 #include <dali-toolkit/dali-toolkit.h>
23 -#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>  
24 #include <dali-toolkit/devel-api/controls/shadow-view/shadow-view.h> 23 #include <dali-toolkit/devel-api/controls/shadow-view/shadow-view.h>
25 24
26 #include <iostream> 25 #include <iostream>
@@ -167,8 +166,8 @@ public: @@ -167,8 +166,8 @@ public:
167 166
168 // Add an effect-changing button on the right of the tool bar. 167 // Add an effect-changing button on the right of the tool bar.
169 Toolkit::PushButton effectChangeButton = Toolkit::PushButton::New(); 168 Toolkit::PushButton effectChangeButton = Toolkit::PushButton::New();
170 - effectChangeButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, CHANGE_EFFECT_IMAGE );  
171 - effectChangeButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, CHANGE_EFFECT_IMAGE_SELECTED ); 169 + effectChangeButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, CHANGE_EFFECT_IMAGE );
  170 + effectChangeButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, CHANGE_EFFECT_IMAGE_SELECTED );
172 effectChangeButton.ClickedSignal().Connect( this, &TestApp::OnEffectButtonClicked ); 171 effectChangeButton.ClickedSignal().Connect( this, &TestApp::OnEffectButtonClicked );
173 toolBar.AddControl( effectChangeButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING ); 172 toolBar.AddControl( effectChangeButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
174 173
@@ -181,8 +180,8 @@ public: @@ -181,8 +180,8 @@ public:
181 180
182 //Add a reset button 181 //Add a reset button
183 Toolkit::PushButton resetButton = Toolkit::PushButton::New(); 182 Toolkit::PushButton resetButton = Toolkit::PushButton::New();
184 - resetButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, RESET_ICON );  
185 - resetButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, RESET_ICON_SELECTED ); 183 + resetButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, RESET_ICON );
  184 + resetButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, RESET_ICON_SELECTED );
186 resetButton.ClickedSignal().Connect( this, &TestApp::OnResetPressed ); 185 resetButton.ClickedSignal().Connect( this, &TestApp::OnResetPressed );
187 toolBar.AddControl( resetButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalCenter, DemoHelper::DEFAULT_PLAY_PADDING ); 186 toolBar.AddControl( resetButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalCenter, DemoHelper::DEFAULT_PLAY_PADDING );
188 187
examples/text-editor/text-editor-example.cpp
  View file @6982eca
1 /* 1 /*
2 - * Copyright (c) 2017 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2019 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@ @@ -22,7 +22,6 @@
22 22
23 // EXTERNAL INCLUDES 23 // EXTERNAL INCLUDES
24 #include <dali-toolkit/dali-toolkit.h> 24 #include <dali-toolkit/dali-toolkit.h>
25 -#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>  
26 #include <sstream> 25 #include <sstream>
27 26
28 // INTERNAL INCLUDES 27 // INTERNAL INCLUDES
@@ -279,8 +278,8 @@ public: @@ -279,8 +278,8 @@ public:
279 colorVisualMap.Add( Toolkit::Visual::Property::TYPE, Visual::COLOR ) 278 colorVisualMap.Add( Toolkit::Visual::Property::TYPE, Visual::COLOR )
280 .Add( ColorVisual::Property::MIX_COLOR, color ); 279 .Add( ColorVisual::Property::MIX_COLOR, color );
281 280
282 - button.SetProperty( DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, colorVisualMap );  
283 - button.SetProperty( DevelButton::Property::SELECTED_BACKGROUND_VISUAL, colorVisualMap ); 281 + button.SetProperty( Button::Property::UNSELECTED_BACKGROUND_VISUAL, colorVisualMap );
  282 + button.SetProperty( Button::Property::SELECTED_BACKGROUND_VISUAL, colorVisualMap );
284 } 283 }
285 284
286 private: 285 private:
examples/text-field/text-field-example.cpp
  View file @6982eca
1 /* 1 /*
2 - * Copyright (c) 2017 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2019 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@ @@ -22,7 +22,6 @@
22 22
23 // EXTERNAL INCLUDES 23 // EXTERNAL INCLUDES
24 #include <dali-toolkit/dali-toolkit.h> 24 #include <dali-toolkit/dali-toolkit.h>
25 -#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>  
26 #include <dali-toolkit/devel-api/controls/popup/popup.h> 25 #include <dali-toolkit/devel-api/controls/popup/popup.h>
27 #include <iostream> 26 #include <iostream>
28 27
@@ -84,8 +83,8 @@ public: @@ -84,8 +83,8 @@ public:
84 PushButton CreateFolderButton() 83 PushButton CreateFolderButton()
85 { 84 {
86 PushButton button = PushButton::New(); 85 PushButton button = PushButton::New();
87 - button.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, FOLDER_ICON_IMAGE );  
88 - button.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, FOLDER_OPEN_ICON_IMAGE ); 86 + button.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, FOLDER_ICON_IMAGE );
  87 + button.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, FOLDER_OPEN_ICON_IMAGE );
89 button.SetAnchorPoint( AnchorPoint::TOP_LEFT ); 88 button.SetAnchorPoint( AnchorPoint::TOP_LEFT );
90 return button; 89 return button;
91 } 90 }
examples/text-label/expanding-buttons-impl.cpp
  View file @6982eca
1 /* 1 /*
2 - * Copyright (c) 2018 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2019 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@ @@ -16,7 +16,6 @@
16 16
17 #include <dali-toolkit/dali-toolkit.h> 17 #include <dali-toolkit/dali-toolkit.h>
18 #include <dali-toolkit/devel-api/controls/control-devel.h> 18 #include <dali-toolkit/devel-api/controls/control-devel.h>
19 -#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>  
20 #include <dali/public-api/animation/animation.h> 19 #include <dali/public-api/animation/animation.h>
21 20
22 #include "expanding-buttons-impl.h" 21 #include "expanding-buttons-impl.h"
@@ -76,8 +75,8 @@ void ExpandingButtons::OnInitialize() @@ -76,8 +75,8 @@ void ExpandingButtons::OnInitialize()
76 75
77 mExpandButton.ClickedSignal().Connect( this, &ExpandingButtons::OnExpandButtonClicked ); 76 mExpandButton.ClickedSignal().Connect( this, &ExpandingButtons::OnExpandButtonClicked );
78 mExpandButton.SetProperty( Button::Property::TOGGLABLE, true ); 77 mExpandButton.SetProperty( Button::Property::TOGGLABLE, true );
79 - mExpandButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, STYLES_IMAGE ); // Default for Styles  
80 - mExpandButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, TICK_IMAGE_IMAGE ); 78 + mExpandButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, STYLES_IMAGE ); // Default for Styles
  79 + mExpandButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, TICK_IMAGE_IMAGE );
81 mExpandButton.SetProperty( Dali::Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); 80 mExpandButton.SetProperty( Dali::Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
82 Self().Add( mExpandButton ); 81 Self().Add( mExpandButton );
83 } 82 }
examples/text-label/text-label-example.cpp
  View file @6982eca
1 /* 1 /*
2 - * Copyright (c) 2018 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2019 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@ @@ -23,7 +23,6 @@
23 // EXTERNAL INCLUDES 23 // EXTERNAL INCLUDES
24 #include <dali/devel-api/object/handle-devel.h> 24 #include <dali/devel-api/object/handle-devel.h>
25 #include <dali/devel-api/actors/actor-devel.h> 25 #include <dali/devel-api/actors/actor-devel.h>
26 -#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>  
27 #include <dali-toolkit/devel-api/controls/text-controls/text-label-devel.h> 26 #include <dali-toolkit/devel-api/controls/text-controls/text-label-devel.h>
28 #include <dali-toolkit/devel-api/text/text-enumerations-devel.h> 27 #include <dali-toolkit/devel-api/text/text-enumerations-devel.h>
29 #include <dali-toolkit/dali-toolkit.h> 28 #include <dali-toolkit/dali-toolkit.h>
@@ -422,7 +421,7 @@ public: @@ -422,7 +421,7 @@ public:
422 { 421 {
423 if ( mColorButtons[i] ) 422 if ( mColorButtons[i] )
424 { 423 {
425 - mColorButtons[ i ].SetProperty( Toolkit::DevelButton::Property::SELECTED, true ); 424 + mColorButtons[ i ].SetProperty( Toolkit::Button::Property::SELECTED, true );
426 } 425 }
427 break; 426 break;
428 } 427 }
@@ -453,17 +452,17 @@ public: @@ -453,17 +452,17 @@ public:
453 Property::Map propertyMap; 452 Property::Map propertyMap;
454 propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); 453 propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR);
455 propertyMap.Insert(ColorVisual::Property::MIX_COLOR, AVAILABLE_COLORS[ index ]); 454 propertyMap.Insert(ColorVisual::Property::MIX_COLOR, AVAILABLE_COLORS[ index ]);
456 - mColorButtons[index].SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, propertyMap );  
457 - mColorButtons[index].SetProperty( Toolkit::DevelButton::Property::UNSELECTED_VISUAL, propertyMap ); 455 + mColorButtons[index].SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, propertyMap );
  456 + mColorButtons[index].SetProperty( Toolkit::Button::Property::UNSELECTED_VISUAL, propertyMap );
458 mColorButtons[index].SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_CENTER ); 457 mColorButtons[index].SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_CENTER );
459 mColorButtons[index].SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_CENTER ); 458 mColorButtons[index].SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_CENTER );
460 459
461 460
462 propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR); 461 propertyMap.Insert(Visual::Property::TYPE, Visual::COLOR);
463 propertyMap.Insert(ColorVisual::Property::MIX_COLOR, AVAILABLE_COLORS[ index ]); 462 propertyMap.Insert(ColorVisual::Property::MIX_COLOR, AVAILABLE_COLORS[ index ]);
464 - mColorButtons[index].SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, propertyMap ); 463 + mColorButtons[index].SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, propertyMap );
465 464
466 - mColorButtons[index].SetProperty( Toolkit::DevelButton::Property::SELECTED_VISUAL, 465 + mColorButtons[index].SetProperty( Toolkit::Button::Property::SELECTED_VISUAL,
467 Property::Map().Add( Visual::Property::TYPE, Visual::BORDER ) 466 Property::Map().Add( Visual::Property::TYPE, Visual::BORDER )
468 .Add( BorderVisual::Property::COLOR, Color::WHITE ) 467 .Add( BorderVisual::Property::COLOR, Color::WHITE )
469 .Add( BorderVisual::Property::SIZE, 4.0f ) 468 .Add( BorderVisual::Property::SIZE, 4.0f )
@@ -531,8 +530,8 @@ public: @@ -531,8 +530,8 @@ public:
531 if ( ! mStyleButtons[index] ) 530 if ( ! mStyleButtons[index] )
532 { 531 {
533 mStyleButtons[index] = PushButton::New(); 532 mStyleButtons[index] = PushButton::New();
534 - mStyleButtons[index].SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, BUTTON_IMAGES[ index ] );  
535 - mStyleButtons[index].SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, STYLE_SELECTED_IMAGE ); 533 + mStyleButtons[index].SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, BUTTON_IMAGES[ index ] );
  534 + mStyleButtons[index].SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, STYLE_SELECTED_IMAGE );
536 mStyleButtons[index].SetProperty( Dali::Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); 535 mStyleButtons[index].SetProperty( Dali::Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
537 mStyleButtons[index].SetSize( mButtonSize ); 536 mStyleButtons[index].SetSize( mButtonSize );
538 mStyleButtons[index].ClickedSignal().Connect( this, &TextLabelExample::OnStyleButtonClicked ); 537 mStyleButtons[index].ClickedSignal().Connect( this, &TextLabelExample::OnStyleButtonClicked );
examples/text-memory-profiling/text-memory-profiling-example.cpp
  View file @6982eca
1 /* 1 /*
2 - * Copyright (c) 2017 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2019 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@ @@ -23,7 +23,6 @@
23 // EXTERNAL INCLUDES 23 // EXTERNAL INCLUDES
24 #include <dali/dali.h> 24 #include <dali/dali.h>
25 #include <dali-toolkit/dali-toolkit.h> 25 #include <dali-toolkit/dali-toolkit.h>
26 -#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>  
27 #include <dali-toolkit/devel-api/controls/navigation-view/navigation-view.h> 26 #include <dali-toolkit/devel-api/controls/navigation-view/navigation-view.h>
28 27
29 // INTERNAL INCLUDES 28 // INTERNAL INCLUDES
@@ -329,8 +328,8 @@ public: @@ -329,8 +328,8 @@ public:
329 328
330 // Create a back button in the left of toolbar 329 // Create a back button in the left of toolbar
331 PushButton backButton = PushButton::New(); 330 PushButton backButton = PushButton::New();
332 - backButton.SetProperty( DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, BACK_IMAGE );  
333 - backButton.SetProperty( DevelButton::Property::SELECTED_BACKGROUND_VISUAL, BACK_IMAGE_SELECTED ); 331 + backButton.SetProperty( Button::Property::UNSELECTED_BACKGROUND_VISUAL, BACK_IMAGE );
  332 + backButton.SetProperty( Button::Property::SELECTED_BACKGROUND_VISUAL, BACK_IMAGE_SELECTED );
334 backButton.ClickedSignal().Connect( this, &TextMemoryProfilingExample::OnBackButtonPressed ); 333 backButton.ClickedSignal().Connect( this, &TextMemoryProfilingExample::OnBackButtonPressed );
335 backButton.SetLeaveRequired( true ); 334 backButton.SetLeaveRequired( true );
336 mToolBar.AddControl( backButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Alignment::HorizontalLeft, DemoHelper::DEFAULT_MODE_SWITCH_PADDING ); 335 mToolBar.AddControl( backButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Alignment::HorizontalLeft, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
examples/text-scrolling/text-scrolling-example.cpp
  View file @6982eca
1 /* 1 /*
2 - * Copyright (c) 2017 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2019 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@ @@ -22,7 +22,6 @@
22 22
23 // EXTERNAL INCLUDES 23 // EXTERNAL INCLUDES
24 #include <dali-toolkit/dali-toolkit.h> 24 #include <dali-toolkit/dali-toolkit.h>
25 -#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>  
26 25
27 using namespace Dali; 26 using namespace Dali;
28 using namespace Dali::Toolkit; 27 using namespace Dali::Toolkit;
@@ -209,8 +208,8 @@ public: @@ -209,8 +208,8 @@ public:
209 208
210 Toolkit::PushButton colorButton = Toolkit::PushButton::New(); 209 Toolkit::PushButton colorButton = Toolkit::PushButton::New();
211 colorButton.SetProperty( Button::Property::TOGGLABLE, true ); 210 colorButton.SetProperty( Button::Property::TOGGLABLE, true );
212 - colorButton.SetProperty( DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, Property::Map().Add ( Toolkit::Visual::Property::TYPE, Visual::COLOR ).Add( ColorVisual::Property::MIX_COLOR, Color::RED ) );  
213 - colorButton.SetProperty( DevelButton::Property::SELECTED_BACKGROUND_VISUAL, Property::Map().Add ( Toolkit::Visual::Property::TYPE, Visual::COLOR ).Add( ColorVisual::Property::MIX_COLOR, Color::BLACK ) ); 211 + colorButton.SetProperty( Button::Property::UNSELECTED_BACKGROUND_VISUAL, Property::Map().Add ( Toolkit::Visual::Property::TYPE, Visual::COLOR ).Add( ColorVisual::Property::MIX_COLOR, Color::RED ) );
  212 + colorButton.SetProperty( Button::Property::SELECTED_BACKGROUND_VISUAL, Property::Map().Add ( Toolkit::Visual::Property::TYPE, Visual::COLOR ).Add( ColorVisual::Property::MIX_COLOR, Color::BLACK ) );
214 colorButton.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER ); 213 colorButton.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER );
215 colorButton.SetParentOrigin( ParentOrigin::BOTTOM_CENTER ); 214 colorButton.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
216 colorButton.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS ); 215 colorButton.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );
examples/video-view/video-view-example.cpp
  View file @6982eca
1 /* 1 /*
2 - * Copyright (c) 2017 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2019 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@ @@ -17,7 +17,6 @@
17 17
18 #include <dali/dali.h> 18 #include <dali/dali.h>
19 #include <dali-toolkit/dali-toolkit.h> 19 #include <dali-toolkit/dali-toolkit.h>
20 -#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>  
21 20
22 using namespace Dali; 21 using namespace Dali;
23 using namespace Toolkit; 22 using namespace Toolkit;
@@ -139,18 +138,18 @@ class VideoViewController: public ConnectionTracker @@ -139,18 +138,18 @@ class VideoViewController: public ConnectionTracker
139 mChangeButton.SetVisible( true ); 138 mChangeButton.SetVisible( true );
140 mChangeButton.SetProperty( Button::Property::DISABLED, false ); 139 mChangeButton.SetProperty( Button::Property::DISABLED, false );
141 140
142 - mPlayButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, PLAY_IMAGE );  
143 - mPlayButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, PLAY_IMAGE );  
144 - mPauseButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, PAUSE_IMAGE );  
145 - mPauseButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, PAUSE_IMAGE ); 141 + mPlayButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, PLAY_IMAGE );
  142 + mPlayButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, PLAY_IMAGE );
  143 + mPauseButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, PAUSE_IMAGE );
  144 + mPauseButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, PAUSE_IMAGE );
146 145
147 - mChangeButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, CHANGE_IMAGE );  
148 - mChangeButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, CHANGE_IMAGE ); 146 + mChangeButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, CHANGE_IMAGE );
  147 + mChangeButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, CHANGE_IMAGE );
149 148
150 - mBackwardButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, BACKWARD_IMAGE );  
151 - mBackwardButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, BACKWARD_IMAGE );  
152 - mForwardButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, FORWARD_IMAGE );  
153 - mForwardButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, FORWARD_IMAGE ); 149 + mBackwardButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, BACKWARD_IMAGE );
  150 + mBackwardButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, BACKWARD_IMAGE );
  151 + mForwardButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, FORWARD_IMAGE );
  152 + mForwardButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, FORWARD_IMAGE );
154 153
155 mPanGestureDetector = PanGestureDetector::New(); 154 mPanGestureDetector = PanGestureDetector::New();
156 mPanGestureDetector.Attach( mVideoView ); 155 mPanGestureDetector.Attach( mVideoView );
resources/scripts/button.json
  View file @6982eca
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 "widthResizePolicy":"FILL_TO_PARENT", 25 "widthResizePolicy":"FILL_TO_PARENT",
26 "heightResizePolicy":"SIZE_RELATIVE_TO_PARENT", 26 "heightResizePolicy":"SIZE_RELATIVE_TO_PARENT",
27 "sizeModeFactor": [1,0.25,1], 27 "sizeModeFactor": [1,0.25,1],
28 - "labelText": "Normal" 28 + "label": "Normal"
29 }, 29 },
30 30
31 // Second Button 31 // Second Button
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
38 "heightResizePolicy":"SIZE_RELATIVE_TO_PARENT", 38 "heightResizePolicy":"SIZE_RELATIVE_TO_PARENT",
39 "sizeModeFactor": [1,0.25,1], 39 "sizeModeFactor": [1,0.25,1],
40 "disabled": true, 40 "disabled": true,
41 - "labelText": "Disabled" 41 + "label": "Disabled"
42 }, 42 },
43 43
44 // Third Button 44 // Third Button
@@ -54,7 +54,7 @@ @@ -54,7 +54,7 @@
54 "togglable": true, 54 "togglable": true,
55 "unselectedStateImage": "{DEMO_IMAGE_DIR}button-up-6.9.png", 55 "unselectedStateImage": "{DEMO_IMAGE_DIR}button-up-6.9.png",
56 "selectedStateImage": "{DEMO_IMAGE_DIR}button-up-8.9.png", 56 "selectedStateImage": "{DEMO_IMAGE_DIR}button-up-8.9.png",
57 - "labelText": "Toggle With Custom Images" 57 + "label": "Toggle With Custom Images"
58 } 58 }
59 ] 59 ]
60 } 60 }
resources/scripts/popup.json
  View file @6982eca
@@ -45,7 +45,7 @@ @@ -45,7 +45,7 @@
45 "parentOrigin": "CENTER_LEFT", 45 "parentOrigin": "CENTER_LEFT",
46 "anchorPoint": "CENTER_LEFT", 46 "anchorPoint": "CENTER_LEFT",
47 "position": [20, 0, 0], 47 "position": [20, 0, 0],
48 - "labelText": "OK" 48 + "label": "OK"
49 }, 49 },
50 { 50 {
51 "type": "PushButton", 51 "type": "PushButton",
@@ -53,7 +53,7 @@ @@ -53,7 +53,7 @@
53 "parentOrigin": "CENTER_RIGHT", 53 "parentOrigin": "CENTER_RIGHT",
54 "anchorPoint": "CENTER_RIGHT", 54 "anchorPoint": "CENTER_RIGHT",
55 "position": [-20, 0, 0], 55 "position": [-20, 0, 0],
56 - "labelText": "Cancel" 56 + "label": "Cancel"
57 } 57 }
58 ] 58 ]
59 }, 59 },
@@ -172,7 +172,7 @@ @@ -172,7 +172,7 @@
172 "parentOrigin": "CENTER_LEFT", 172 "parentOrigin": "CENTER_LEFT",
173 "anchorPoint": "CENTER_LEFT", 173 "anchorPoint": "CENTER_LEFT",
174 "position": [20, 0, 0], 174 "position": [20, 0, 0],
175 - "labelText": "OK" 175 + "label": "OK"
176 }, 176 },
177 { 177 {
178 "type": "PushButton", 178 "type": "PushButton",
@@ -180,7 +180,7 @@ @@ -180,7 +180,7 @@
180 "parentOrigin": "CENTER_RIGHT", 180 "parentOrigin": "CENTER_RIGHT",
181 "anchorPoint": "CENTER_RIGHT", 181 "anchorPoint": "CENTER_RIGHT",
182 "position": [-20, 0, 0], 182 "position": [-20, 0, 0],
183 - "labelText": "Cancel" 183 + "label": "Cancel"
184 } 184 }
185 ] 185 ]
186 }, 186 },
@@ -257,7 +257,7 @@ @@ -257,7 +257,7 @@
257 "widthResizePolicy": "SIZE_RELATIVE_TO_PARENT", 257 "widthResizePolicy": "SIZE_RELATIVE_TO_PARENT",
258 "heightResizePolicy": "SIZE_RELATIVE_TO_PARENT", 258 "heightResizePolicy": "SIZE_RELATIVE_TO_PARENT",
259 "sizeModeFactor": [0.38, 0.14, 1.0], 259 "sizeModeFactor": [0.38, 0.14, 1.0],
260 - "labelText": "Popup", 260 + "label": "Popup",
261 "signals": [{ 261 "signals": [{
262 "name": "clicked", 262 "name": "clicked",
263 "action": "set", 263 "action": "set",
@@ -274,7 +274,7 @@ @@ -274,7 +274,7 @@
274 "widthResizePolicy": "SIZE_RELATIVE_TO_PARENT", 274 "widthResizePolicy": "SIZE_RELATIVE_TO_PARENT",
275 "heightResizePolicy": "SIZE_RELATIVE_TO_PARENT", 275 "heightResizePolicy": "SIZE_RELATIVE_TO_PARENT",
276 "sizeModeFactor": [0.38, 0.14, 1.0], 276 "sizeModeFactor": [0.38, 0.14, 1.0],
277 - "labelText": "Animated", 277 + "label": "Animated",
278 "signals": [{ 278 "signals": [{
279 "name": "clicked", 279 "name": "clicked",
280 "action": "set", 280 "action": "set",
@@ -291,7 +291,7 @@ @@ -291,7 +291,7 @@
291 "widthResizePolicy": "SIZE_RELATIVE_TO_PARENT", 291 "widthResizePolicy": "SIZE_RELATIVE_TO_PARENT",
292 "heightResizePolicy": "SIZE_RELATIVE_TO_PARENT", 292 "heightResizePolicy": "SIZE_RELATIVE_TO_PARENT",
293 "sizeModeFactor": [0.5, 0.14, 1.0], 293 "sizeModeFactor": [0.5, 0.14, 1.0],
294 - "labelText": "Push for Toast", 294 + "label": "Push for Toast",
295 "signals": [{ 295 "signals": [{
296 "name": "clicked", 296 "name": "clicked",
297 "action": "set", 297 "action": "set",
resources/scripts/super-blur-view.json
  View file @6982eca
@@ -63,7 +63,7 @@ @@ -63,7 +63,7 @@
63 "anchorPoint": "BOTTOM_CENTER", 63 "anchorPoint": "BOTTOM_CENTER",
64 "position": [0, 0, 0], 64 "position": [0, 0, 0],
65 "size": [200, 100, 0], 65 "size": [200, 100, 0],
66 - "labelText": "Blur", 66 + "label": "Blur",
67 "siblingOrder": 1, 67 "siblingOrder": 1,
68 "signals": [{ 68 "signals": [{
69 "name": "pressed", 69 "name": "pressed",