Move some toys back to examples

tvtennis, corkboards and dynamicscene are more examples than demos.

clocks and tic-tac-toe are remaining demos for now.

Change-Id: I3d9501a4742349a9eb7efdad0d06aa6e7cb02c14
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>

diff --git a/examples/demos/dynamicscene/content/Button.qml b/examples/qml/dynamicscene/content/Button.qml
similarity index 100%
rename from examples/demos/dynamicscene/content/Button.qml
rename to examples/qml/dynamicscene/content/Button.qml

diff --git a/examples/demos/dynamicscene/content/GenericSceneItem.qml b/examples/qml/dynamicscene/content/GenericSceneItem.qml
similarity index 100%
rename from examples/demos/dynamicscene/content/GenericSceneItem.qml
rename to examples/qml/dynamicscene/content/GenericSceneItem.qml

diff --git a/examples/demos/dynamicscene/content/PaletteItem.qml b/examples/qml/dynamicscene/content/PaletteItem.qml
similarity index 100%
rename from examples/demos/dynamicscene/content/PaletteItem.qml
rename to examples/qml/dynamicscene/content/PaletteItem.qml

diff --git a/examples/demos/dynamicscene/content/PerspectiveItem.qml b/examples/qml/dynamicscene/content/PerspectiveItem.qml
similarity index 100%
rename from examples/demos/dynamicscene/content/PerspectiveItem.qml
rename to examples/qml/dynamicscene/content/PerspectiveItem.qml

diff --git a/examples/demos/dynamicscene/content/Sun.qml b/examples/qml/dynamicscene/content/Sun.qml
similarity index 100%
rename from examples/demos/dynamicscene/content/Sun.qml
rename to examples/qml/dynamicscene/content/Sun.qml

diff --git a/examples/demos/dynamicscene/content/images/NOTE b/examples/qml/dynamicscene/content/images/NOTE
similarity index 100%
rename from examples/demos/dynamicscene/content/images/NOTE
rename to examples/qml/dynamicscene/content/images/NOTE

diff --git a/examples/demos/dynamicscene/content/images/face-smile.png b/examples/qml/dynamicscene/content/images/face-smile.png
similarity index 100%
rename from examples/demos/dynamicscene/content/images/face-smile.png
rename to examples/qml/dynamicscene/content/images/face-smile.png

diff --git a/examples/demos/dynamicscene/content/images/moon.png b/examples/qml/dynamicscene/content/images/moon.png
similarity index 100%
rename from examples/demos/dynamicscene/content/images/moon.png
rename to examples/qml/dynamicscene/content/images/moon.png

diff --git a/examples/demos/dynamicscene/content/images/rabbit_brown.png b/examples/qml/dynamicscene/content/images/rabbit_brown.png
similarity index 100%
rename from examples/demos/dynamicscene/content/images/rabbit_brown.png
rename to examples/qml/dynamicscene/content/images/rabbit_brown.png

diff --git a/examples/demos/dynamicscene/content/images/rabbit_bw.png b/examples/qml/dynamicscene/content/images/rabbit_bw.png
similarity index 100%
rename from examples/demos/dynamicscene/content/images/rabbit_bw.png
rename to examples/qml/dynamicscene/content/images/rabbit_bw.png

diff --git a/examples/demos/dynamicscene/content/images/star.png b/examples/qml/dynamicscene/content/images/star.png
similarity index 100%
rename from examples/demos/dynamicscene/content/images/star.png
rename to examples/qml/dynamicscene/content/images/star.png

diff --git a/examples/demos/dynamicscene/content/images/sun.png b/examples/qml/dynamicscene/content/images/sun.png
similarity index 100%
rename from examples/demos/dynamicscene/content/images/sun.png
rename to examples/qml/dynamicscene/content/images/sun.png

diff --git a/examples/demos/dynamicscene/content/images/tree_s.png b/examples/qml/dynamicscene/content/images/tree_s.png
similarity index 100%
rename from examples/demos/dynamicscene/content/images/tree_s.png
rename to examples/qml/dynamicscene/content/images/tree_s.png

diff --git a/examples/demos/dynamicscene/content/itemCreation.js b/examples/qml/dynamicscene/content/itemCreation.js
similarity index 100%
rename from examples/demos/dynamicscene/content/itemCreation.js
rename to examples/qml/dynamicscene/content/itemCreation.js

diff --git a/examples/demos/dynamicscene/dynamicscene.qml b/examples/qml/dynamicscene/dynamicscene.qml
similarity index 100%
rename from examples/demos/dynamicscene/dynamicscene.qml
rename to examples/qml/dynamicscene/dynamicscene.qml

diff --git a/examples/qtquick/animation/animation.qml b/examples/qtquick/animation/animation.qml
index 62a85a9..bca6845 100644 (file)
--- a/examples/qtquick/animation/animation.qml
+++ b/examples/qtquick/animation/animation.qml
@@ -58,6 +58,8 @@ import "../../shared" as Examples
 
     Wiggly Text demonstrates using more complex behaviors to animate and wiggle some text around as you drag it.
 
+    Tv Tennis demonstrates using more complex behaviors to get paddles following a ball for an infinite game.
+
     Easing Curves shows off all the easing curves available in Qt Quick animations.
 
     States demonstrates how the properties of an item can vary between states.
@@ -80,6 +82,7 @@ Item {
             addExample("PropertyAnimation", "Interpolates between numbers", Qt.resolvedUrl("basics/property-animation.qml"));
             addExample("Behaviors", "Animates procedural movement", Qt.resolvedUrl("behaviors/behavior-example.qml"));
             addExample("Wiggly Text", "Text that wiggles as you drag it", Qt.resolvedUrl("behaviors/wigglytext.qml"));
+            addExample("Tv Tennis", "Paddles that follow a ball", Qt.resolvedUrl("behaviors/tvtennis.qml"));
             addExample("Easing Curves", "Compare available easing curves", Qt.resolvedUrl("easing/easing.qml"));
             addExample("States", "Simple states", Qt.resolvedUrl("states/states.qml"));
             addExample("Transitions", "Simple states with animated transitions", Qt.resolvedUrl("states/transitions.qml"));

diff --git a/examples/demos/tvtennis/tvtennis.qml b/examples/qtquick/animation/behaviors/tvtennis.qml
similarity index 99%
rename from examples/demos/tvtennis/tvtennis.qml
rename to examples/qtquick/animation/behaviors/tvtennis.qml
index 63866e3..108f19a 100644 (file)
--- a/examples/demos/tvtennis/tvtennis.qml
+++ b/examples/qtquick/animation/behaviors/tvtennis.qml
@@ -42,7 +42,7 @@ import QtQuick 2.0
 
 Rectangle {
     id: page
-    width: 640; height: 480
+    width: 320; height: 480;
     color: "Black"
 
     // Make a ball to bounce

diff --git a/examples/demos/corkboards/content/Day.qml b/examples/qtquick/touchinteraction/flickable/content/Day.qml
similarity index 100%
rename from examples/demos/corkboards/content/Day.qml
rename to examples/qtquick/touchinteraction/flickable/content/Day.qml

diff --git a/examples/demos/corkboards/content/cork.jpg b/examples/qtquick/touchinteraction/flickable/content/cork.jpg
similarity index 100%
rename from examples/demos/corkboards/content/cork.jpg
rename to examples/qtquick/touchinteraction/flickable/content/cork.jpg

diff --git a/examples/demos/corkboards/content/note-yellow.png b/examples/qtquick/touchinteraction/flickable/content/note-yellow.png
similarity index 100%
rename from examples/demos/corkboards/content/note-yellow.png
rename to examples/qtquick/touchinteraction/flickable/content/note-yellow.png

diff --git a/examples/demos/corkboards/content/tack.png b/examples/qtquick/touchinteraction/flickable/content/tack.png
similarity index 100%
rename from examples/demos/corkboards/content/tack.png
rename to examples/qtquick/touchinteraction/flickable/content/tack.png

diff --git a/examples/demos/corkboards/corkboards.qml b/examples/qtquick/touchinteraction/flickable/corkboards.qml
similarity index 100%
rename from examples/demos/corkboards/corkboards.qml
rename to examples/qtquick/touchinteraction/flickable/corkboards.qml