Rename OnStage signals and related internal changes

Change-Id: I2a2938b310fa7ada962632f23e19c580586b34b6

diff --git a/examples/styling/image-channel-control-impl.cpp b/examples/styling/image-channel-control-impl.cpp
index b67e0adb289e6881196f7b7136a17cbe6f40e90e..f494cc4a50b7cafa624d6c45ef64616ba27c5a2e 100644 (file)
--- 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 bcfa9eacfd5682801e741468455fb88c74ae3254..a2edfeeced1853f5be310f5bd60c548a765155c9 100644 (file)
--- 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 8b02150b5c32a045b6e0036871dad2f6a7dc02cc..4b48e926fa51235717b4c665b75fac780bd1150d 100644 (file)
--- 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 cbf146e9e4d07ca68244f3133495b5c2a87d150a..bb0ed9afaf489346ecd9f255d9ebf51018b08ef1 100644 (file)
--- 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 dc889857c7da42fbf8d5f200e5add161f210c9fc..47f2e47d48df550cdec03a950ccae29df154f348 100644 (file)
--- 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 95596a318daf3e749be6f48c2617384916c39c77..87bc457ba9c889b0359e84cc2bba0718ef18e613 100644 (file)
--- 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 e930a2b0f5ed2960604d7d3fd3178cb8d1ecb6ea..5c6e3e0734ecdc214aa75aa98b783460386ad4a7 100644 (file)
--- 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 a3048c13eb2b01aa87dac106bb333434bf841e29..a8b31cc7425d814a0d1d8a6530fdd62f449c57f5 100644 (file)
--- 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 24a5fb3a75ecc9cc9f59bdf5da362cc059b93e83..c64cc18ba0cacc75784239d84a10109b81d99f62 100644 (file)
--- 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 21cb43effafc02364dba1abcae00b386c5e39a39..4d95f05b0d29bb915a088dfbe22ab796663e776c 100644 (file)
--- 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 03b22ebdb1d9d781039a10dd1ac9d2bd8c6fa722..beb85dd0597bfef29b3abec8a7ee8eacffd6f548 100644 (file)
--- 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