Peter M. Groen / dali-demo

Change-Id: I8ac0787692b34882c2d98717ab778574dbdab7a0

Change-Id: I52f3b59064ae8c1e6951132b2e3a4c38e7d4b759
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>

Change-Id: I5932f0191f358e986fcaace820fb2ecb43b9812b

Conflicts:
	demo/dali-demo.cpp
	demo/dali-table-view.cpp
	examples/builder/examples.cpp
	examples/buttons/buttons-example.cpp
	examples/item-view/item-view-example.cpp
	examples/path-animation/path-animation.cpp
	examples/text-view/text-view-example.cpp
	shared/view.h

Change-Id: I152b06854b349f0430172227f1d79ee16855fbc0

Change-Id: Ie7dcdc64bf70fea8ab68af85b729fa5a9de0b652
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>

Usage:
Will load both JSON and JavaScript file from command line
scripting.example my-scene.json my-script.js

Change-Id: I36330b8bae84a532f57989b4087843d178d03e0b

Change-Id: Iffcdd6753c39fa83e7f68ef927339374bc0061a2

Change-Id: I8609692959d95f0ee58213d9271a014ba85fb49d
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>

Change-Id: I05a17ea530a14e94040f24db332178335ce3ce52

It caused a reordering issue.

Change-Id: I79a098f31873d55cc0e2d669e88d1e4adc547704
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>

Change-Id: I2c5814f4c364e7fe1baf8da352c100529fc074ab

Change-Id: I05e4ec4191816dc247d6536d4c85b3dbe43599ef

Update for following changes in dali-toolkit:
Control::Property::BACKGROUND -> Control::Property::BACKGROUND_IMAGE
Control::SetBackground()      -> Control::SetBackgroundImage()
"background"                  -> "background-image"

Change-Id: I4fd1f14509fd14112bfeb38d0f18128b0f61ab2b

Change-Id: Ib490798b013cf1847fb867dd478a571d28e6fc73

(Until it's working on mobile)

Change-Id: I25cf304797046b68bf56a71357fedc406e08cd21

This reverts commit a6f2bba05b6db85066145ed10d882e9514f267da.

Change-Id: I7c0993c884a61cf7d906f2da64fab0677d92774b

Change-Id: Ica4f357358704c12dd69e882efcb49c6dffd233e

Change-Id: Ie9718a263a8ab3b12209e1409754834ed986460f

Change-Id: I4d107d2611cb03b218ea03e9b7e2d26b9b403127

Change-Id: Ia5d8582b8eec61517443f24e191e01662ba4a26d

Change-Id: I5f0e4ad2e2b52cd25aa8661dd95f688ac6c41a8b
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>

Conflicts:
	examples/text-view/text-view-example.cpp

Change-Id: I112aab85d61c49687bed286c4d6435fae35f416a

Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
Change-Id: I7629356cb2678ee8eda85eff0cbef6a530ab7a17

Change-Id: I092baac3133471d94aa62109548a745a74b037e0

Update for following changes in dali-core:
Actor::MoveBy                     -> TranslateBy
Actor::ColorBy                    -> <removed>
Actor::OpacityBy                  -> <removed>
Actor::SetRotation                -> SetOrientation
Actor::GetCurrentRotation         -> GetCurrentOrientation
Actor::GetCurrentWorldRotation    -> GetCurrentWorldOrientation
Actor::SetInheritRotation         -> SetInheritOrientation
Actor::IsRotationInherited        -> IsOrientationInherited
Actor::Property::ROTATION         -> Actor::Property::ORIENTATION
Actor::Property::WORLD_ROTATION   -> Actor::Property::WORLD_ORIENTATION
Actor::Property::INHERIT_ROTATION -> Actor::Property::INHERIT_ORIENTATION

Change-Id: I0e883d5588e2f18beba32d64a2407253fe1fb286

Change-Id: I2fb46cadadd81d5c30212f8db4d91386c3281a5d

Change-Id: I9fb727955e339e123f5ca92fbc15a7d2d1479939
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>

Change-Id: Id953da32620c4a3c57519cf9f5ecd74eb765a430

Change-Id: I300bf3260b3dfec153583e5b4c0c1ee6ee1eebea

Change-Id: Ifa5f15cfd57ee71294bc52af0d7b394ff6a5d64a

Change-Id: I1d3e62c1ad548c1c81b4c8dab2246c22a68249aa
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>

Change-Id: I703035788451cb057a7834199136cc70d22c87e4

Change-Id: I310242f574e549ff412248a56db8e747a4981c43

* In both demos: set the size of the text-label control,
    otherwise the size negotiation sets the natural size.
  * In the multilanguage demo: change the parent origin and anchor point of the labels.

Change-Id: I38ccd60fff826e293ee83f4aae88ab615feab1cf
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>

Change-Id: Ib25db927ec8f9e53247d0b980e30404738f894d2