Peter M. Groen / dali-demo

Commit 4b15b3d240b775aa3f8cb579207761fbc5c29bb5

Authored by Richard Huang
1 parent 3b242e81

Rename OnStage signals and related internal changes 

Change-Id: I2a2938b310fa7ada962632f23e19c580586b34b6
Inline Side-by-side
Showing 11 changed files with 42 additions and 42 deletions
examples/styling/image-channel-control-impl.cpp
  View file @4b15b3d
1 1 /*
2   - * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -160,14 +160,14 @@ void ImageChannelControl::OnInitialize()
160 160 mChannelIndex = self.RegisterProperty( "uChannels", Vector3(1.0f, 1.0f, 1.0f) );
161 161 }
162 162  
163   -void ImageChannelControl::OnStageConnection( int depth )
  163 +void ImageChannelControl::OnSceneConnection( int depth )
164 164 {
165   - Control::OnStageConnection( depth );
  165 + Control::OnSceneConnection( depth );
166 166 }
167 167  
168   -void ImageChannelControl::OnStageDisconnection()
  168 +void ImageChannelControl::OnSceneDisconnection()
169 169 {
170   - Control::OnStageDisconnection();
  170 + Control::OnSceneDisconnection();
171 171 }
172 172  
173 173 void ImageChannelControl::OnSizeSet( const Vector3& targetSize )
... ...
examples/styling/image-channel-control-impl.h
  View file @4b15b3d
... ... @@ -2,7 +2,7 @@
2 2 #define DALI_DEMO_INTERNAL_IMAGE_CHANNEL_CONTROL_IMPL_H
3 3  
4 4 /*
5   - * Copyright (c) 2016 Samsung Electronics Co., Ltd.
  5 + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
6 6 *
7 7 * Licensed under the Apache License, Version 2.0 (the "License");
8 8 * you may not use this file except in compliance with the License.
... ... @@ -74,14 +74,14 @@ private: // From Control
74 74 virtual void OnInitialize();
75 75  
76 76 /**
77   - * @copydoc Toolkit::Control::OnStageConnect()
  77 + * @copydoc Toolkit::Control::OnSceneConnection()
78 78 */
79   - virtual void OnStageConnection( int depth );
  79 + virtual void OnSceneConnection( int depth );
80 80  
81 81 /**
82   - * @copydoc Toolkit::Control::OnStageDisconnection()
  82 + * @copydoc Toolkit::Control::OnSceneDisconnection()
83 83 */
84   - virtual void OnStageDisconnection();
  84 + virtual void OnSceneDisconnection();
85 85  
86 86 /**
87 87 * @copydoc Toolkit::Control::OnSizeSet()
... ...
examples/transitions/shadow-button-impl.cpp
  View file @4b15b3d
1 1 /*
2   - * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -201,14 +201,14 @@ void ShadowButton::OnInitialize()
201 201 Actor self = Self();
202 202 }
203 203  
204   -void ShadowButton::OnStageConnection( int depth )
  204 +void ShadowButton::OnSceneConnection( int depth )
205 205 {
206   - Control::OnStageConnection( depth );
  206 + Control::OnSceneConnection( depth );
207 207 }
208 208  
209   -void ShadowButton::OnStageDisconnection()
  209 +void ShadowButton::OnSceneDisconnection()
210 210 {
211   - Control::OnStageDisconnection();
  211 + Control::OnSceneDisconnection();
212 212 }
213 213  
214 214 void ShadowButton::OnSizeSet( const Vector3& targetSize )
... ...
examples/transitions/shadow-button-impl.h
  View file @4b15b3d
... ... @@ -2,7 +2,7 @@
2 2 #define DALI_DEMO_INTERNAL_SHADOW_BUTTON_IMPL_H
3 3  
4 4 /*
5   - * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  5 + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
6 6 *
7 7 * Licensed under the Apache License, Version 2.0 (the "License");
8 8 * you may not use this file except in compliance with the License.
... ... @@ -90,14 +90,14 @@ private: // From Control
90 90 virtual void OnInitialize();
91 91  
92 92 /**
93   - * @copydoc Toolkit::Button::OnStageConnect()
  93 + * @copydoc Toolkit::Button::OnSceneConnection()
94 94 */
95   - virtual void OnStageConnection( int depth );
  95 + virtual void OnSceneConnection( int depth );
96 96  
97 97 /**
98   - * @copydoc Toolkit::Button::OnStageDisconnection()
  98 + * @copydoc Toolkit::Button::OnSceneDisconnection()
99 99 */
100   - virtual void OnStageDisconnection();
  100 + virtual void OnSceneDisconnection();
101 101  
102 102 /**
103 103 * @copydoc Toolkit::Button::OnSizeSet()
... ...
examples/visual-transitions/beat-control-impl.cpp
  View file @4b15b3d
1 1 /*
2   - * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -179,14 +179,14 @@ void BeatControl::OnInitialize()
179 179 Actor self = Self();
180 180 }
181 181  
182   -void BeatControl::OnStageConnection( int depth )
  182 +void BeatControl::OnSceneConnection( int depth )
183 183 {
184   - Control::OnStageConnection( depth );
  184 + Control::OnSceneConnection( depth );
185 185 }
186 186  
187   -void BeatControl::OnStageDisconnection()
  187 +void BeatControl::OnSceneDisconnection()
188 188 {
189   - Control::OnStageDisconnection();
  189 + Control::OnSceneDisconnection();
190 190 }
191 191  
192 192 void BeatControl::OnSizeSet( const Vector3& targetSize )
... ...
examples/visual-transitions/beat-control-impl.h
  View file @4b15b3d
... ... @@ -2,7 +2,7 @@
2 2 #define DALI_DEMO_INTERNAL_BEAT_CONTROL_IMPL_H
3 3  
4 4 /*
5   - * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  5 + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
6 6 *
7 7 * Licensed under the Apache License, Version 2.0 (the "License");
8 8 * you may not use this file except in compliance with the License.
... ... @@ -73,14 +73,14 @@ private: // From Control
73 73 virtual void OnInitialize();
74 74  
75 75 /**
76   - * @copydoc Toolkit::Control::OnStageConnect()
  76 + * @copydoc Toolkit::Control::OnSceneConnection()
77 77 */
78   - virtual void OnStageConnection( int depth );
  78 + virtual void OnSceneConnection( int depth );
79 79  
80 80 /**
81   - * @copydoc Toolkit::Control::OnStageDisconnection()
  81 + * @copydoc Toolkit::Control::OnSceneDisconnection()
82 82 */
83   - virtual void OnStageDisconnection();
  83 + virtual void OnSceneDisconnection();
84 84  
85 85 /**
86 86 * @copydoc Toolkit::Control::OnSizeSet()
... ...
resources/scripts/animated-colors.json
  View file @4b15b3d
1 1 /*
2   - * Copyright (c) 2014 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2020 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -834,7 +834,7 @@
834 834 ],
835 835 "signals": [
836 836 {
837   - "name": "onStage",
  837 + "name": "onScene",
838 838 "action": "play",
839 839 "animation": "Animation_1"
840 840 }
... ...
resources/scripts/clock.json
  View file @4b15b3d
... ... @@ -14,7 +14,7 @@
14 14 "selected": false,
15 15 "signals": [
16 16 {
17   - "name": "onStage",
  17 + "name": "onScene",
18 18 "action": "play",
19 19 "animation": "animate-seconds"
20 20 }]
... ... @@ -32,7 +32,7 @@
32 32 },
33 33 "signals": [
34 34 {
35   - "name": "onStage",
  35 + "name": "onScene",
36 36 "action": "play",
37 37 "animation": "animate-minutes"
38 38 }]
... ... @@ -50,7 +50,7 @@
50 50 },
51 51 "signals": [
52 52 {
53   - "name": "onStage",
  53 + "name": "onScene",
54 54 "action": "play",
55 55 "animation": "animate-hours"
56 56 }]
... ...
resources/scripts/shader-effect-ripple.json
  View file @4b15b3d
... ... @@ -39,7 +39,7 @@
39 39 },
40 40 "signals": [
41 41 {
42   - "name": "onStage",
  42 + "name": "onScene",
43 43 "action": "play",
44 44 "animation": "Animation_1"
45 45 }
... ...
shared/dali-table-view.cpp
  View file @4b15b3d
... ... @@ -358,9 +358,9 @@ void DaliTableView::CreateFocusEffect()
358 358  
359 359 keyboardFocusManager.SetFocusIndicatorActor( mFocusEffect[0].actor );
360 360  
361   - // Connect to the on & off stage signals of the indicator which represents when it is enabled & disabled respectively
362   - mFocusEffect[0].actor.OnStageSignal().Connect( this, &DaliTableView::OnFocusIndicatorEnabled );
363   - mFocusEffect[0].actor.OffStageSignal().Connect( this, &DaliTableView::OnFocusIndicatorDisabled );
  361 + // Connect to the on & off scene signals of the indicator which represents when it is enabled & disabled respectively
  362 + mFocusEffect[0].actor.OnSceneSignal().Connect( this, &DaliTableView::OnFocusIndicatorEnabled );
  363 + mFocusEffect[0].actor.OffSceneSignal().Connect( this, &DaliTableView::OnFocusIndicatorDisabled );
364 364 }
365 365  
366 366 void DaliTableView::OnFocusIndicatorEnabled( Actor /* actor */ )
... ...
shared/dali-table-view.h
  View file @4b15b3d
... ... @@ -332,10 +332,10 @@ private: // Application callbacks & implementation
332 332 void OnButtonsPageRelayout( const Dali::Actor& actor );
333 333  
334 334 /**
335   - * @brief The is connected to the keyboard focus highlight actor, and called when it is placed on stage.
336   - * @param[in] actor The actor that has been placed on stage.
  335 + * @brief The is connected to the keyboard focus highlight actor, and called when it is placed on the scene.
  336 + * @param[in] actor The actor that has been placed on the scene.
337 337 */
338   - void OnStageConnect( Dali::Actor actor );
  338 + void OnSceneConnect( Dali::Actor actor );
339 339  
340 340 /**
341 341 * @brief Callback called to set up background actors
... ...