Merge "Rename OnStage signals and related internal changes" into devel/master

Adeel Kazmi · Gerrit Code Review
2 parents f35c5c93 4b15b3d2
Showing 11 changed files with 42 additions and 42 deletions
examples/styling/image-channel-control-impl.cpp
examples/styling/image-channel-control-impl.h
examples/transitions/shadow-button-impl.cpp
examples/transitions/shadow-button-impl.h
examples/visual-transitions/beat-control-impl.cpp
examples/visual-transitions/beat-control-impl.h
resources/scripts/animated-colors.json
resources/scripts/clock.json
resources/scripts/shader-effect-ripple.json
shared/dali-table-view.cpp
shared/dali-table-view.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.
@@ -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 )
@@ -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()
 /*
- * 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 )
@@ -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()
 /*
- * 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 )
@@ -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()
 /*
- * 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"
         }
@@ -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"
       }]
@@ -39,7 +39,7 @@
       },
       "signals": [
         {
-          "name": "onStage",
+          "name": "onScene",
           "action": "play",
           "animation": "Animation_1"
         }
@@ -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 */ )
@@ -332,10 +332,10 @@ private: // Application callbacks &amp; 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