From 4b15b3d240b775aa3f8cb579207761fbc5c29bb5 Mon Sep 17 00:00:00 2001 From: Richard Huang Date: Tue, 4 Aug 2020 12:13:16 +0100 Subject: [PATCH] Rename OnStage signals and related internal changes Change-Id: I2a2938b310fa7ada962632f23e19c580586b34b6 --- examples/styling/image-channel-control-impl.cpp | 10 +++++----- examples/styling/image-channel-control-impl.h | 10 +++++----- examples/transitions/shadow-button-impl.cpp | 10 +++++----- examples/transitions/shadow-button-impl.h | 10 +++++----- examples/visual-transitions/beat-control-impl.cpp | 10 +++++----- examples/visual-transitions/beat-control-impl.h | 10 +++++----- resources/scripts/animated-colors.json | 4 ++-- resources/scripts/clock.json | 6 +++--- resources/scripts/shader-effect-ripple.json | 2 +- shared/dali-table-view.cpp | 6 +++--- shared/dali-table-view.h | 6 +++--- 11 files changed, 42 insertions(+), 42 deletions(-) diff --git a/examples/styling/image-channel-control-impl.cpp b/examples/styling/image-channel-control-impl.cpp index b67e0ad..f494cc4 100644 --- a/examples/styling/image-channel-control-impl.cpp +++ b/examples/styling/image-channel-control-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -160,14 +160,14 @@ void ImageChannelControl::OnInitialize() mChannelIndex = self.RegisterProperty( "uChannels", Vector3(1.0f, 1.0f, 1.0f) ); } -void ImageChannelControl::OnStageConnection( int depth ) +void ImageChannelControl::OnSceneConnection( int depth ) { - Control::OnStageConnection( depth ); + Control::OnSceneConnection( depth ); } -void ImageChannelControl::OnStageDisconnection() +void ImageChannelControl::OnSceneDisconnection() { - Control::OnStageDisconnection(); + Control::OnSceneDisconnection(); } void ImageChannelControl::OnSizeSet( const Vector3& targetSize ) diff --git a/examples/styling/image-channel-control-impl.h b/examples/styling/image-channel-control-impl.h index bcfa9ea..a2edfee 100644 --- a/examples/styling/image-channel-control-impl.h +++ b/examples/styling/image-channel-control-impl.h @@ -2,7 +2,7 @@ #define DALI_DEMO_INTERNAL_IMAGE_CHANNEL_CONTROL_IMPL_H /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -74,14 +74,14 @@ private: // From Control virtual void OnInitialize(); /** - * @copydoc Toolkit::Control::OnStageConnect() + * @copydoc Toolkit::Control::OnSceneConnection() */ - virtual void OnStageConnection( int depth ); + virtual void OnSceneConnection( int depth ); /** - * @copydoc Toolkit::Control::OnStageDisconnection() + * @copydoc Toolkit::Control::OnSceneDisconnection() */ - virtual void OnStageDisconnection(); + virtual void OnSceneDisconnection(); /** * @copydoc Toolkit::Control::OnSizeSet() diff --git a/examples/transitions/shadow-button-impl.cpp b/examples/transitions/shadow-button-impl.cpp index 8b02150..4b48e92 100644 --- a/examples/transitions/shadow-button-impl.cpp +++ b/examples/transitions/shadow-button-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -201,14 +201,14 @@ void ShadowButton::OnInitialize() Actor self = Self(); } -void ShadowButton::OnStageConnection( int depth ) +void ShadowButton::OnSceneConnection( int depth ) { - Control::OnStageConnection( depth ); + Control::OnSceneConnection( depth ); } -void ShadowButton::OnStageDisconnection() +void ShadowButton::OnSceneDisconnection() { - Control::OnStageDisconnection(); + Control::OnSceneDisconnection(); } void ShadowButton::OnSizeSet( const Vector3& targetSize ) diff --git a/examples/transitions/shadow-button-impl.h b/examples/transitions/shadow-button-impl.h index cbf146e..bb0ed9a 100644 --- a/examples/transitions/shadow-button-impl.h +++ b/examples/transitions/shadow-button-impl.h @@ -2,7 +2,7 @@ #define DALI_DEMO_INTERNAL_SHADOW_BUTTON_IMPL_H /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -90,14 +90,14 @@ private: // From Control virtual void OnInitialize(); /** - * @copydoc Toolkit::Button::OnStageConnect() + * @copydoc Toolkit::Button::OnSceneConnection() */ - virtual void OnStageConnection( int depth ); + virtual void OnSceneConnection( int depth ); /** - * @copydoc Toolkit::Button::OnStageDisconnection() + * @copydoc Toolkit::Button::OnSceneDisconnection() */ - virtual void OnStageDisconnection(); + virtual void OnSceneDisconnection(); /** * @copydoc Toolkit::Button::OnSizeSet() diff --git a/examples/visual-transitions/beat-control-impl.cpp b/examples/visual-transitions/beat-control-impl.cpp index dc88985..47f2e47 100644 --- a/examples/visual-transitions/beat-control-impl.cpp +++ b/examples/visual-transitions/beat-control-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -179,14 +179,14 @@ void BeatControl::OnInitialize() Actor self = Self(); } -void BeatControl::OnStageConnection( int depth ) +void BeatControl::OnSceneConnection( int depth ) { - Control::OnStageConnection( depth ); + Control::OnSceneConnection( depth ); } -void BeatControl::OnStageDisconnection() +void BeatControl::OnSceneDisconnection() { - Control::OnStageDisconnection(); + Control::OnSceneDisconnection(); } void BeatControl::OnSizeSet( const Vector3& targetSize ) diff --git a/examples/visual-transitions/beat-control-impl.h b/examples/visual-transitions/beat-control-impl.h index 95596a3..87bc457 100644 --- a/examples/visual-transitions/beat-control-impl.h +++ b/examples/visual-transitions/beat-control-impl.h @@ -2,7 +2,7 @@ #define DALI_DEMO_INTERNAL_BEAT_CONTROL_IMPL_H /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -73,14 +73,14 @@ private: // From Control virtual void OnInitialize(); /** - * @copydoc Toolkit::Control::OnStageConnect() + * @copydoc Toolkit::Control::OnSceneConnection() */ - virtual void OnStageConnection( int depth ); + virtual void OnSceneConnection( int depth ); /** - * @copydoc Toolkit::Control::OnStageDisconnection() + * @copydoc Toolkit::Control::OnSceneDisconnection() */ - virtual void OnStageDisconnection(); + virtual void OnSceneDisconnection(); /** * @copydoc Toolkit::Control::OnSizeSet() diff --git a/resources/scripts/animated-colors.json b/resources/scripts/animated-colors.json index e930a2b..5c6e3e0 100644 --- a/resources/scripts/animated-colors.json +++ b/resources/scripts/animated-colors.json @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -834,7 +834,7 @@ ], "signals": [ { - "name": "onStage", + "name": "onScene", "action": "play", "animation": "Animation_1" } diff --git a/resources/scripts/clock.json b/resources/scripts/clock.json index a3048c1..a8b31cc 100644 --- a/resources/scripts/clock.json +++ b/resources/scripts/clock.json @@ -14,7 +14,7 @@ "selected": false, "signals": [ { - "name": "onStage", + "name": "onScene", "action": "play", "animation": "animate-seconds" }] @@ -32,7 +32,7 @@ }, "signals": [ { - "name": "onStage", + "name": "onScene", "action": "play", "animation": "animate-minutes" }] @@ -50,7 +50,7 @@ }, "signals": [ { - "name": "onStage", + "name": "onScene", "action": "play", "animation": "animate-hours" }] diff --git a/resources/scripts/shader-effect-ripple.json b/resources/scripts/shader-effect-ripple.json index 24a5fb3..c64cc18 100644 --- a/resources/scripts/shader-effect-ripple.json +++ b/resources/scripts/shader-effect-ripple.json @@ -39,7 +39,7 @@ }, "signals": [ { - "name": "onStage", + "name": "onScene", "action": "play", "animation": "Animation_1" } diff --git a/shared/dali-table-view.cpp b/shared/dali-table-view.cpp index 21cb43e..4d95f05 100644 --- a/shared/dali-table-view.cpp +++ b/shared/dali-table-view.cpp @@ -358,9 +358,9 @@ void DaliTableView::CreateFocusEffect() keyboardFocusManager.SetFocusIndicatorActor( mFocusEffect[0].actor ); - // Connect to the on & off stage signals of the indicator which represents when it is enabled & disabled respectively - mFocusEffect[0].actor.OnStageSignal().Connect( this, &DaliTableView::OnFocusIndicatorEnabled ); - mFocusEffect[0].actor.OffStageSignal().Connect( this, &DaliTableView::OnFocusIndicatorDisabled ); + // Connect to the on & off scene signals of the indicator which represents when it is enabled & disabled respectively + mFocusEffect[0].actor.OnSceneSignal().Connect( this, &DaliTableView::OnFocusIndicatorEnabled ); + mFocusEffect[0].actor.OffSceneSignal().Connect( this, &DaliTableView::OnFocusIndicatorDisabled ); } void DaliTableView::OnFocusIndicatorEnabled( Actor /* actor */ ) diff --git a/shared/dali-table-view.h b/shared/dali-table-view.h index 03b22eb..beb85dd 100644 --- a/shared/dali-table-view.h +++ b/shared/dali-table-view.h @@ -332,10 +332,10 @@ private: // Application callbacks & implementation void OnButtonsPageRelayout( const Dali::Actor& actor ); /** - * @brief The is connected to the keyboard focus highlight actor, and called when it is placed on stage. - * @param[in] actor The actor that has been placed on stage. + * @brief The is connected to the keyboard focus highlight actor, and called when it is placed on the scene. + * @param[in] actor The actor that has been placed on the scene. */ - void OnStageConnect( Dali::Actor actor ); + void OnSceneConnect( Dali::Actor actor ); /** * @brief Callback called to set up background actors -- 2.7.4