diff options
author | Alan Alpert <alan.alpert@nokia.com> | 2012-02-28 11:30:16 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-28 09:19:53 +0100 |
commit | 01bfcfba0287fa7e9e051e2540ebbdb01fee5a9e (patch) | |
tree | 934353470a620fd2658a220db1d35093318bd814 /examples | |
parent | 7d32bacfc574dabb469ad8c0a83c70bb0fc6d770 (diff) |
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>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/qml/dynamicscene/content/Button.qml (renamed from examples/demos/dynamicscene/content/Button.qml) | 0 | ||||
-rw-r--r-- | examples/qml/dynamicscene/content/GenericSceneItem.qml (renamed from examples/demos/dynamicscene/content/GenericSceneItem.qml) | 0 | ||||
-rw-r--r-- | examples/qml/dynamicscene/content/PaletteItem.qml (renamed from examples/demos/dynamicscene/content/PaletteItem.qml) | 0 | ||||
-rw-r--r-- | examples/qml/dynamicscene/content/PerspectiveItem.qml (renamed from examples/demos/dynamicscene/content/PerspectiveItem.qml) | 0 | ||||
-rw-r--r-- | examples/qml/dynamicscene/content/Sun.qml (renamed from examples/demos/dynamicscene/content/Sun.qml) | 0 | ||||
-rw-r--r-- | examples/qml/dynamicscene/content/images/NOTE (renamed from examples/demos/dynamicscene/content/images/NOTE) | 0 | ||||
-rw-r--r-- | examples/qml/dynamicscene/content/images/face-smile.png (renamed from examples/demos/dynamicscene/content/images/face-smile.png) | bin | 15408 -> 15408 bytes | |||
-rw-r--r-- | examples/qml/dynamicscene/content/images/moon.png (renamed from examples/demos/dynamicscene/content/images/moon.png) | bin | 1757 -> 1757 bytes | |||
-rw-r--r-- | examples/qml/dynamicscene/content/images/rabbit_brown.png (renamed from examples/demos/dynamicscene/content/images/rabbit_brown.png) | bin | 1245 -> 1245 bytes | |||
-rw-r--r-- | examples/qml/dynamicscene/content/images/rabbit_bw.png (renamed from examples/demos/dynamicscene/content/images/rabbit_bw.png) | bin | 1759 -> 1759 bytes | |||
-rw-r--r-- | examples/qml/dynamicscene/content/images/star.png (renamed from examples/demos/dynamicscene/content/images/star.png) | bin | 349 -> 349 bytes | |||
-rw-r--r-- | examples/qml/dynamicscene/content/images/sun.png (renamed from examples/demos/dynamicscene/content/images/sun.png) | bin | 8153 -> 8153 bytes | |||
-rw-r--r-- | examples/qml/dynamicscene/content/images/tree_s.png (renamed from examples/demos/dynamicscene/content/images/tree_s.png) | bin | 3406 -> 3406 bytes | |||
-rw-r--r-- | examples/qml/dynamicscene/content/itemCreation.js (renamed from examples/demos/dynamicscene/content/itemCreation.js) | 0 | ||||
-rw-r--r-- | examples/qml/dynamicscene/dynamicscene.qml (renamed from examples/demos/dynamicscene/dynamicscene.qml) | 0 | ||||
-rw-r--r-- | examples/qtquick/animation/animation.qml | 3 | ||||
-rw-r--r-- | examples/qtquick/animation/behaviors/tvtennis.qml (renamed from examples/demos/tvtennis/tvtennis.qml) | 2 | ||||
-rw-r--r-- | examples/qtquick/touchinteraction/flickable/content/Day.qml (renamed from examples/demos/corkboards/content/Day.qml) | 0 | ||||
-rw-r--r-- | examples/qtquick/touchinteraction/flickable/content/cork.jpg (renamed from examples/demos/corkboards/content/cork.jpg) | bin | 149337 -> 149337 bytes | |||
-rw-r--r-- | examples/qtquick/touchinteraction/flickable/content/note-yellow.png (renamed from examples/demos/corkboards/content/note-yellow.png) | bin | 54559 -> 54559 bytes | |||
-rw-r--r-- | examples/qtquick/touchinteraction/flickable/content/tack.png (renamed from examples/demos/corkboards/content/tack.png) | bin | 7282 -> 7282 bytes | |||
-rw-r--r-- | examples/qtquick/touchinteraction/flickable/corkboards.qml (renamed from examples/demos/corkboards/corkboards.qml) | 0 |
22 files changed, 4 insertions, 1 deletions
diff --git a/examples/demos/dynamicscene/content/Button.qml b/examples/qml/dynamicscene/content/Button.qml index 014692274a..014692274a 100644 --- a/examples/demos/dynamicscene/content/Button.qml +++ b/examples/qml/dynamicscene/content/Button.qml diff --git a/examples/demos/dynamicscene/content/GenericSceneItem.qml b/examples/qml/dynamicscene/content/GenericSceneItem.qml index 0408aa87fb..0408aa87fb 100644 --- a/examples/demos/dynamicscene/content/GenericSceneItem.qml +++ b/examples/qml/dynamicscene/content/GenericSceneItem.qml diff --git a/examples/demos/dynamicscene/content/PaletteItem.qml b/examples/qml/dynamicscene/content/PaletteItem.qml index e993f89989..e993f89989 100644 --- a/examples/demos/dynamicscene/content/PaletteItem.qml +++ b/examples/qml/dynamicscene/content/PaletteItem.qml diff --git a/examples/demos/dynamicscene/content/PerspectiveItem.qml b/examples/qml/dynamicscene/content/PerspectiveItem.qml index f651369452..f651369452 100644 --- a/examples/demos/dynamicscene/content/PerspectiveItem.qml +++ b/examples/qml/dynamicscene/content/PerspectiveItem.qml diff --git a/examples/demos/dynamicscene/content/Sun.qml b/examples/qml/dynamicscene/content/Sun.qml index b84516eecc..b84516eecc 100644 --- a/examples/demos/dynamicscene/content/Sun.qml +++ b/examples/qml/dynamicscene/content/Sun.qml diff --git a/examples/demos/dynamicscene/content/images/NOTE b/examples/qml/dynamicscene/content/images/NOTE index fcd87f9132..fcd87f9132 100644 --- a/examples/demos/dynamicscene/content/images/NOTE +++ b/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 Binary files differindex 3d66d72578..3d66d72578 100644 --- a/examples/demos/dynamicscene/content/images/face-smile.png +++ b/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 Binary files differindex 1c0d6066a8..1c0d6066a8 100644 --- a/examples/demos/dynamicscene/content/images/moon.png +++ b/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 Binary files differindex ebfdeed332..ebfdeed332 100644 --- a/examples/demos/dynamicscene/content/images/rabbit_brown.png +++ b/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 Binary files differindex 7bff9b92ca..7bff9b92ca 100644 --- a/examples/demos/dynamicscene/content/images/rabbit_bw.png +++ b/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 Binary files differindex 27ef924267..27ef924267 100644 --- a/examples/demos/dynamicscene/content/images/star.png +++ b/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 Binary files differindex 7713ca5ce7..7713ca5ce7 100644 --- a/examples/demos/dynamicscene/content/images/sun.png +++ b/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 Binary files differindex 6eac35a729..6eac35a729 100644 --- a/examples/demos/dynamicscene/content/images/tree_s.png +++ b/examples/qml/dynamicscene/content/images/tree_s.png diff --git a/examples/demos/dynamicscene/content/itemCreation.js b/examples/qml/dynamicscene/content/itemCreation.js index 40f5415f9f..40f5415f9f 100644 --- a/examples/demos/dynamicscene/content/itemCreation.js +++ b/examples/qml/dynamicscene/content/itemCreation.js diff --git a/examples/demos/dynamicscene/dynamicscene.qml b/examples/qml/dynamicscene/dynamicscene.qml index c64df5cfc0..c64df5cfc0 100644 --- a/examples/demos/dynamicscene/dynamicscene.qml +++ b/examples/qml/dynamicscene/dynamicscene.qml diff --git a/examples/qtquick/animation/animation.qml b/examples/qtquick/animation/animation.qml index 62a85a9cfa..bca68457d9 100644 --- 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 index 63866e3ce6..108f19a11d 100644 --- 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 index 7fe625c305..7fe625c305 100644 --- a/examples/demos/corkboards/content/Day.qml +++ b/examples/qtquick/touchinteraction/flickable/content/Day.qml diff --git a/examples/demos/corkboards/content/cork.jpg b/examples/qtquick/touchinteraction/flickable/content/cork.jpg Binary files differindex 160bc002bf..160bc002bf 100644 --- a/examples/demos/corkboards/content/cork.jpg +++ b/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 Binary files differindex 8ddecc8b03..8ddecc8b03 100644 --- a/examples/demos/corkboards/content/note-yellow.png +++ b/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 Binary files differindex cef2d1cd23..cef2d1cd23 100644 --- a/examples/demos/corkboards/content/tack.png +++ b/examples/qtquick/touchinteraction/flickable/content/tack.png diff --git a/examples/demos/corkboards/corkboards.qml b/examples/qtquick/touchinteraction/flickable/corkboards.qml index dc3aa6b378..dc3aa6b378 100644 --- a/examples/demos/corkboards/corkboards.qml +++ b/examples/qtquick/touchinteraction/flickable/corkboards.qml |