diff options
author | Alexis Menard <alexis.menard@nokia.com> | 2009-07-28 16:32:31 +0200 |
---|---|---|
committer | Alexis Menard <alexis.menard@nokia.com> | 2009-07-28 16:34:03 +0200 |
commit | 2094d3c03ba895e4458a0bb6b1b4935abacd4816 (patch) | |
tree | 9c3e3b12850a9924aad48d2b07fcbcd00d5d604d | |
parent | 9a21c1abb96426b7a9f168b007d05db303a8de65 (diff) |
Move sub-attaq from examples to demos because sub-attaq is a bit
too "advanced".
-rw-r--r-- | demos/demos.pro | 4 | ||||
-rw-r--r-- | demos/qtdemo/xml/examples.xml | 2 | ||||
-rw-r--r-- | demos/sub-attaq/animationmanager.cpp (renamed from examples/animation/sub-attaq/animationmanager.cpp) | 0 | ||||
-rw-r--r-- | demos/sub-attaq/animationmanager.h (renamed from examples/animation/sub-attaq/animationmanager.h) | 0 | ||||
-rw-r--r-- | demos/sub-attaq/boat.cpp (renamed from examples/animation/sub-attaq/boat.cpp) | 0 | ||||
-rw-r--r-- | demos/sub-attaq/boat.h (renamed from examples/animation/sub-attaq/boat.h) | 0 | ||||
-rw-r--r-- | demos/sub-attaq/boat_p.h (renamed from examples/animation/sub-attaq/boat_p.h) | 0 | ||||
-rw-r--r-- | demos/sub-attaq/bomb.cpp (renamed from examples/animation/sub-attaq/bomb.cpp) | 0 | ||||
-rw-r--r-- | demos/sub-attaq/bomb.h (renamed from examples/animation/sub-attaq/bomb.h) | 0 | ||||
-rw-r--r-- | demos/sub-attaq/custompropertyanimation.cpp (renamed from examples/animation/sub-attaq/custompropertyanimation.cpp) | 0 | ||||
-rw-r--r-- | demos/sub-attaq/custompropertyanimation.h (renamed from examples/animation/sub-attaq/custompropertyanimation.h) | 0 | ||||
-rw-r--r-- | demos/sub-attaq/data.xml | 39 | ||||
-rw-r--r-- | demos/sub-attaq/graphicsscene.cpp (renamed from examples/animation/sub-attaq/graphicsscene.cpp) | 0 | ||||
-rw-r--r-- | demos/sub-attaq/graphicsscene.h (renamed from examples/animation/sub-attaq/graphicsscene.h) | 0 | ||||
-rw-r--r-- | demos/sub-attaq/main.cpp (renamed from examples/animation/sub-attaq/main.cpp) | 0 | ||||
-rw-r--r-- | demos/sub-attaq/mainwindow.cpp (renamed from examples/animation/sub-attaq/mainwindow.cpp) | 0 | ||||
-rw-r--r-- | demos/sub-attaq/mainwindow.h (renamed from examples/animation/sub-attaq/mainwindow.h) | 0 | ||||
-rw-r--r-- | demos/sub-attaq/pics/big/background.png (renamed from examples/animation/sub-attaq/pics/big/background.png) | bin | 48858 -> 48858 bytes | |||
-rw-r--r-- | demos/sub-attaq/pics/big/boat.png (renamed from examples/animation/sub-attaq/pics/big/boat.png) | bin | 5198 -> 5198 bytes | |||
-rw-r--r-- | demos/sub-attaq/pics/big/bomb.png (renamed from examples/animation/sub-attaq/pics/big/bomb.png) | bin | 760 -> 760 bytes | |||
-rw-r--r-- | demos/sub-attaq/pics/big/explosion/boat/step1.png (renamed from examples/animation/sub-attaq/pics/big/explosion/boat/step1.png) | bin | 5760 -> 5760 bytes | |||
-rw-r--r-- | demos/sub-attaq/pics/big/explosion/boat/step2.png (renamed from examples/animation/sub-attaq/pics/big/explosion/boat/step2.png) | bin | 9976 -> 9976 bytes | |||
-rw-r--r-- | demos/sub-attaq/pics/big/explosion/boat/step3.png (renamed from examples/animation/sub-attaq/pics/big/explosion/boat/step3.png) | bin | 12411 -> 12411 bytes | |||
-rw-r--r-- | demos/sub-attaq/pics/big/explosion/boat/step4.png (renamed from examples/animation/sub-attaq/pics/big/explosion/boat/step4.png) | bin | 15438 -> 15438 bytes | |||
-rw-r--r-- | demos/sub-attaq/pics/big/explosion/submarine/step1.png (renamed from examples/animation/sub-attaq/pics/big/explosion/submarine/step1.png) | bin | 3354 -> 3354 bytes | |||
-rw-r--r-- | demos/sub-attaq/pics/big/explosion/submarine/step2.png (renamed from examples/animation/sub-attaq/pics/big/explosion/submarine/step2.png) | bin | 6205 -> 6205 bytes | |||
-rw-r--r-- | demos/sub-attaq/pics/big/explosion/submarine/step3.png (renamed from examples/animation/sub-attaq/pics/big/explosion/submarine/step3.png) | bin | 6678 -> 6678 bytes | |||
-rw-r--r-- | demos/sub-attaq/pics/big/explosion/submarine/step4.png (renamed from examples/animation/sub-attaq/pics/big/explosion/submarine/step4.png) | bin | 6666 -> 6666 bytes | |||
-rw-r--r-- | demos/sub-attaq/pics/big/submarine.png (renamed from examples/animation/sub-attaq/pics/big/submarine.png) | bin | 3202 -> 3202 bytes | |||
-rw-r--r-- | demos/sub-attaq/pics/big/surface.png (renamed from examples/animation/sub-attaq/pics/big/surface.png) | bin | 575 -> 575 bytes | |||
-rw-r--r-- | demos/sub-attaq/pics/big/torpedo.png (renamed from examples/animation/sub-attaq/pics/big/torpedo.png) | bin | 951 -> 951 bytes | |||
-rw-r--r-- | demos/sub-attaq/pics/scalable/background-n810.svg (renamed from examples/animation/sub-attaq/pics/scalable/background-n810.svg) | 0 | ||||
-rw-r--r-- | demos/sub-attaq/pics/scalable/background.svg (renamed from examples/animation/sub-attaq/pics/scalable/background.svg) | 0 | ||||
-rw-r--r-- | demos/sub-attaq/pics/scalable/boat.svg (renamed from examples/animation/sub-attaq/pics/scalable/boat.svg) | 0 | ||||
-rw-r--r-- | demos/sub-attaq/pics/scalable/bomb.svg (renamed from examples/animation/sub-attaq/pics/scalable/bomb.svg) | 0 | ||||
-rw-r--r-- | demos/sub-attaq/pics/scalable/sand.svg (renamed from examples/animation/sub-attaq/pics/scalable/sand.svg) | 0 | ||||
-rw-r--r-- | demos/sub-attaq/pics/scalable/see.svg (renamed from examples/animation/sub-attaq/pics/scalable/see.svg) | 0 | ||||
-rw-r--r-- | demos/sub-attaq/pics/scalable/sky.svg (renamed from examples/animation/sub-attaq/pics/scalable/sky.svg) | 0 | ||||
-rw-r--r-- | demos/sub-attaq/pics/scalable/sub-attaq.svg (renamed from examples/animation/sub-attaq/pics/scalable/sub-attaq.svg) | 0 | ||||
-rw-r--r-- | demos/sub-attaq/pics/scalable/submarine.svg (renamed from examples/animation/sub-attaq/pics/scalable/submarine.svg) | 0 | ||||
-rw-r--r-- | demos/sub-attaq/pics/scalable/surface.svg (renamed from examples/animation/sub-attaq/pics/scalable/surface.svg) | 0 | ||||
-rw-r--r-- | demos/sub-attaq/pics/scalable/torpedo.svg (renamed from examples/animation/sub-attaq/pics/scalable/torpedo.svg) | 0 | ||||
-rw-r--r-- | demos/sub-attaq/pics/small/background.png (renamed from examples/animation/sub-attaq/pics/small/background.png) | bin | 34634 -> 34634 bytes | |||
-rw-r--r-- | demos/sub-attaq/pics/small/boat.png (renamed from examples/animation/sub-attaq/pics/small/boat.png) | bin | 2394 -> 2394 bytes | |||
-rw-r--r-- | demos/sub-attaq/pics/small/bomb.png (renamed from examples/animation/sub-attaq/pics/small/bomb.png) | bin | 760 -> 760 bytes | |||
-rw-r--r-- | demos/sub-attaq/pics/small/submarine.png (renamed from examples/animation/sub-attaq/pics/small/submarine.png) | bin | 1338 -> 1338 bytes | |||
-rw-r--r-- | demos/sub-attaq/pics/small/surface.png (renamed from examples/animation/sub-attaq/pics/small/surface.png) | bin | 502 -> 502 bytes | |||
-rw-r--r-- | demos/sub-attaq/pics/small/torpedo.png (renamed from examples/animation/sub-attaq/pics/small/torpedo.png) | bin | 951 -> 951 bytes | |||
-rw-r--r-- | demos/sub-attaq/pics/welcome/logo-a.png (renamed from examples/animation/sub-attaq/pics/welcome/logo-a.png) | bin | 5972 -> 5972 bytes | |||
-rw-r--r-- | demos/sub-attaq/pics/welcome/logo-a2.png (renamed from examples/animation/sub-attaq/pics/welcome/logo-a2.png) | bin | 5969 -> 5969 bytes | |||
-rw-r--r-- | demos/sub-attaq/pics/welcome/logo-b.png (renamed from examples/animation/sub-attaq/pics/welcome/logo-b.png) | bin | 6869 -> 6869 bytes | |||
-rw-r--r-- | demos/sub-attaq/pics/welcome/logo-dash.png (renamed from examples/animation/sub-attaq/pics/welcome/logo-dash.png) | bin | 2255 -> 2255 bytes | |||
-rw-r--r-- | demos/sub-attaq/pics/welcome/logo-excl.png (renamed from examples/animation/sub-attaq/pics/welcome/logo-excl.png) | bin | 2740 -> 2740 bytes | |||
-rw-r--r-- | demos/sub-attaq/pics/welcome/logo-q.png (renamed from examples/animation/sub-attaq/pics/welcome/logo-q.png) | bin | 7016 -> 7016 bytes | |||
-rw-r--r-- | demos/sub-attaq/pics/welcome/logo-s.png (renamed from examples/animation/sub-attaq/pics/welcome/logo-s.png) | bin | 5817 -> 5817 bytes | |||
-rw-r--r-- | demos/sub-attaq/pics/welcome/logo-t.png (renamed from examples/animation/sub-attaq/pics/welcome/logo-t.png) | bin | 3717 -> 3717 bytes | |||
-rw-r--r-- | demos/sub-attaq/pics/welcome/logo-t2.png (renamed from examples/animation/sub-attaq/pics/welcome/logo-t2.png) | bin | 3688 -> 3688 bytes | |||
-rw-r--r-- | demos/sub-attaq/pics/welcome/logo-u.png (renamed from examples/animation/sub-attaq/pics/welcome/logo-u.png) | bin | 5374 -> 5374 bytes | |||
-rw-r--r-- | demos/sub-attaq/pixmapitem.cpp (renamed from examples/animation/sub-attaq/pixmapitem.cpp) | 0 | ||||
-rw-r--r-- | demos/sub-attaq/pixmapitem.h (renamed from examples/animation/sub-attaq/pixmapitem.h) | 0 | ||||
-rw-r--r-- | demos/sub-attaq/progressitem.cpp (renamed from examples/animation/sub-attaq/progressitem.cpp) | 0 | ||||
-rw-r--r-- | demos/sub-attaq/progressitem.h (renamed from examples/animation/sub-attaq/progressitem.h) | 0 | ||||
-rw-r--r-- | demos/sub-attaq/qanimationstate.cpp (renamed from examples/animation/sub-attaq/qanimationstate.cpp) | 0 | ||||
-rw-r--r-- | demos/sub-attaq/qanimationstate.h (renamed from examples/animation/sub-attaq/qanimationstate.h) | 0 | ||||
-rw-r--r-- | demos/sub-attaq/states.cpp (renamed from examples/animation/sub-attaq/states.cpp) | 0 | ||||
-rw-r--r-- | demos/sub-attaq/states.h (renamed from examples/animation/sub-attaq/states.h) | 0 | ||||
-rw-r--r-- | demos/sub-attaq/sub-attaq.pro (renamed from examples/animation/sub-attaq/sub-attaq.pro) | 5 | ||||
-rw-r--r-- | demos/sub-attaq/subattaq.qrc (renamed from examples/animation/sub-attaq/subattaq.qrc) | 0 | ||||
-rw-r--r-- | demos/sub-attaq/submarine.cpp (renamed from examples/animation/sub-attaq/submarine.cpp) | 0 | ||||
-rw-r--r-- | demos/sub-attaq/submarine.h (renamed from examples/animation/sub-attaq/submarine.h) | 0 | ||||
-rw-r--r-- | demos/sub-attaq/submarine_p.h (renamed from examples/animation/sub-attaq/submarine_p.h) | 0 | ||||
-rw-r--r-- | demos/sub-attaq/torpedo.cpp (renamed from examples/animation/sub-attaq/torpedo.cpp) | 0 | ||||
-rw-r--r-- | demos/sub-attaq/torpedo.h (renamed from examples/animation/sub-attaq/torpedo.h) | 0 | ||||
-rw-r--r-- | doc/src/demos/sub-attaq.qdoc | 54 | ||||
-rw-r--r-- | doc/src/images/sub-attaq-demo.png | bin | 0 -> 51552 bytes | |||
-rw-r--r-- | examples/animation/animation.pro | 1 | ||||
-rw-r--r-- | examples/animation/sub-attaq/data.xml | 15 |
77 files changed, 100 insertions, 20 deletions
diff --git a/demos/demos.pro b/demos/demos.pro index 60845500f2..eda04dc0bc 100644 --- a/demos/demos.pro +++ b/demos/demos.pro @@ -13,7 +13,8 @@ SUBDIRS = \ demos_textedit \ demos_chip \ demos_embeddeddialogs \ - demos_undo + demos_undo \ + demos_sub-attaq contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles1):!contains(QT_CONFIG, opengles1cl):!contains(QT_CONFIG, opengles2):{ SUBDIRS += demos_boxes @@ -61,6 +62,7 @@ demos_mediaplayer.subdir = mediaplayer demos_browser.subdir = browser demos_boxes.subdir = boxes +demos_sub-attaq.subdir = sub-attaq #CONFIG += ordered !ordered { diff --git a/demos/qtdemo/xml/examples.xml b/demos/qtdemo/xml/examples.xml index 25608489e8..a81eead660 100644 --- a/demos/qtdemo/xml/examples.xml +++ b/demos/qtdemo/xml/examples.xml @@ -18,6 +18,7 @@ <example filename="browser" name="Browser" /> <example filename="mediaplayer" name="Media Player" /> <example filename="boxes" name="Boxes" /> + <example filename="sub-attaq" name="Sub-attaq" /> </demos> <category dirname="animation" name="Animation Framework"> <example filename="animatedtiles" name="Animated Tiles" /> @@ -26,7 +27,6 @@ <example filename="moveblocks" name="Moving Blocks" /> <example filename="states" name="UI States" /> <example filename="stickman" name="Stickman" /> - <example filename="sub-attaq" name="Sub-attaq" /> </category> <category dirname="qtconcurrent" name="Concurrent Programming"> <example filename="map" name="Map" executable="false" /> diff --git a/examples/animation/sub-attaq/animationmanager.cpp b/demos/sub-attaq/animationmanager.cpp index 13266f9911..13266f9911 100644 --- a/examples/animation/sub-attaq/animationmanager.cpp +++ b/demos/sub-attaq/animationmanager.cpp diff --git a/examples/animation/sub-attaq/animationmanager.h b/demos/sub-attaq/animationmanager.h index 63ecae6d09..63ecae6d09 100644 --- a/examples/animation/sub-attaq/animationmanager.h +++ b/demos/sub-attaq/animationmanager.h diff --git a/examples/animation/sub-attaq/boat.cpp b/demos/sub-attaq/boat.cpp index 68e646e0b6..68e646e0b6 100644 --- a/examples/animation/sub-attaq/boat.cpp +++ b/demos/sub-attaq/boat.cpp diff --git a/examples/animation/sub-attaq/boat.h b/demos/sub-attaq/boat.h index f6b1a9029c..f6b1a9029c 100644 --- a/examples/animation/sub-attaq/boat.h +++ b/demos/sub-attaq/boat.h diff --git a/examples/animation/sub-attaq/boat_p.h b/demos/sub-attaq/boat_p.h index 4e962fc752..4e962fc752 100644 --- a/examples/animation/sub-attaq/boat_p.h +++ b/demos/sub-attaq/boat_p.h diff --git a/examples/animation/sub-attaq/bomb.cpp b/demos/sub-attaq/bomb.cpp index e92a723307..e92a723307 100644 --- a/examples/animation/sub-attaq/bomb.cpp +++ b/demos/sub-attaq/bomb.cpp diff --git a/examples/animation/sub-attaq/bomb.h b/demos/sub-attaq/bomb.h index ed6b0f535d..ed6b0f535d 100644 --- a/examples/animation/sub-attaq/bomb.h +++ b/demos/sub-attaq/bomb.h diff --git a/examples/animation/sub-attaq/custompropertyanimation.cpp b/demos/sub-attaq/custompropertyanimation.cpp index 9282f4202e..9282f4202e 100644 --- a/examples/animation/sub-attaq/custompropertyanimation.cpp +++ b/demos/sub-attaq/custompropertyanimation.cpp diff --git a/examples/animation/sub-attaq/custompropertyanimation.h b/demos/sub-attaq/custompropertyanimation.h index a984163368..a984163368 100644 --- a/examples/animation/sub-attaq/custompropertyanimation.h +++ b/demos/sub-attaq/custompropertyanimation.h diff --git a/demos/sub-attaq/data.xml b/demos/sub-attaq/data.xml new file mode 100644 index 0000000000..0f30515ddf --- /dev/null +++ b/demos/sub-attaq/data.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<subattaq> + <submarines> + <submarine type="0" points="10" name="Q1" /> + <submarine type="1" points="20" name="Q2" /> + </submarines> + <levels> + <level id="0" name="Seaman recruit"> + <subinstance type="0" nb="1"/> + </level> + <level id="1" name="Seaman apprentice"> + <subinstance type="0" nb="2"/> + </level> + <level id="2" name="Seaman"> + <subinstance type="0" nb="4"/> + </level> + <level id="3" name="Petty Officer Third Class"> + <subinstance type="0" nb="6"/> + </level> + <level id="4" name="Petty Officer Second Class"> + <subinstance type="0" nb="6"/> + </level> + <level id="5" name="Petty Officer First Class"> + <subinstance type="0" nb="8"/> + </level> + <level id="6" name="Lieutenant"> + <subinstance type="0" nb="10"/> + </level> + <level id="7" name="Commander"> + <subinstance type="0" nb="15"/> + </level> + <level id="8" name="Captain"> + <subinstance type="0" nb="12"/> + </level> + <level id="9" name="Admiral"> + <subinstance type="0" nb="12"/> + </level> + </levels> +</subattaq> diff --git a/examples/animation/sub-attaq/graphicsscene.cpp b/demos/sub-attaq/graphicsscene.cpp index fcbc1b3921..fcbc1b3921 100644 --- a/examples/animation/sub-attaq/graphicsscene.cpp +++ b/demos/sub-attaq/graphicsscene.cpp diff --git a/examples/animation/sub-attaq/graphicsscene.h b/demos/sub-attaq/graphicsscene.h index 068ee97efb..068ee97efb 100644 --- a/examples/animation/sub-attaq/graphicsscene.h +++ b/demos/sub-attaq/graphicsscene.h diff --git a/examples/animation/sub-attaq/main.cpp b/demos/sub-attaq/main.cpp index 4f6f4f96ed..4f6f4f96ed 100644 --- a/examples/animation/sub-attaq/main.cpp +++ b/demos/sub-attaq/main.cpp diff --git a/examples/animation/sub-attaq/mainwindow.cpp b/demos/sub-attaq/mainwindow.cpp index bcccd344ff..bcccd344ff 100644 --- a/examples/animation/sub-attaq/mainwindow.cpp +++ b/demos/sub-attaq/mainwindow.cpp diff --git a/examples/animation/sub-attaq/mainwindow.h b/demos/sub-attaq/mainwindow.h index 08cfcd9880..08cfcd9880 100644 --- a/examples/animation/sub-attaq/mainwindow.h +++ b/demos/sub-attaq/mainwindow.h diff --git a/examples/animation/sub-attaq/pics/big/background.png b/demos/sub-attaq/pics/big/background.png Binary files differindex 9f581571fa..9f581571fa 100644 --- a/examples/animation/sub-attaq/pics/big/background.png +++ b/demos/sub-attaq/pics/big/background.png diff --git a/examples/animation/sub-attaq/pics/big/boat.png b/demos/sub-attaq/pics/big/boat.png Binary files differindex be82dff62a..be82dff62a 100644 --- a/examples/animation/sub-attaq/pics/big/boat.png +++ b/demos/sub-attaq/pics/big/boat.png diff --git a/examples/animation/sub-attaq/pics/big/bomb.png b/demos/sub-attaq/pics/big/bomb.png Binary files differindex 3af5f2f29c..3af5f2f29c 100644 --- a/examples/animation/sub-attaq/pics/big/bomb.png +++ b/demos/sub-attaq/pics/big/bomb.png diff --git a/examples/animation/sub-attaq/pics/big/explosion/boat/step1.png b/demos/sub-attaq/pics/big/explosion/boat/step1.png Binary files differindex c9fd8b0984..c9fd8b0984 100644 --- a/examples/animation/sub-attaq/pics/big/explosion/boat/step1.png +++ b/demos/sub-attaq/pics/big/explosion/boat/step1.png diff --git a/examples/animation/sub-attaq/pics/big/explosion/boat/step2.png b/demos/sub-attaq/pics/big/explosion/boat/step2.png Binary files differindex 7528f2d2da..7528f2d2da 100644 --- a/examples/animation/sub-attaq/pics/big/explosion/boat/step2.png +++ b/demos/sub-attaq/pics/big/explosion/boat/step2.png diff --git a/examples/animation/sub-attaq/pics/big/explosion/boat/step3.png b/demos/sub-attaq/pics/big/explosion/boat/step3.png Binary files differindex aae9c9c184..aae9c9c184 100644 --- a/examples/animation/sub-attaq/pics/big/explosion/boat/step3.png +++ b/demos/sub-attaq/pics/big/explosion/boat/step3.png diff --git a/examples/animation/sub-attaq/pics/big/explosion/boat/step4.png b/demos/sub-attaq/pics/big/explosion/boat/step4.png Binary files differindex d697c1bae8..d697c1bae8 100644 --- a/examples/animation/sub-attaq/pics/big/explosion/boat/step4.png +++ b/demos/sub-attaq/pics/big/explosion/boat/step4.png diff --git a/examples/animation/sub-attaq/pics/big/explosion/submarine/step1.png b/demos/sub-attaq/pics/big/explosion/submarine/step1.png Binary files differindex 88ca5144b7..88ca5144b7 100644 --- a/examples/animation/sub-attaq/pics/big/explosion/submarine/step1.png +++ b/demos/sub-attaq/pics/big/explosion/submarine/step1.png diff --git a/examples/animation/sub-attaq/pics/big/explosion/submarine/step2.png b/demos/sub-attaq/pics/big/explosion/submarine/step2.png Binary files differindex 524f5890ee..524f5890ee 100644 --- a/examples/animation/sub-attaq/pics/big/explosion/submarine/step2.png +++ b/demos/sub-attaq/pics/big/explosion/submarine/step2.png diff --git a/examples/animation/sub-attaq/pics/big/explosion/submarine/step3.png b/demos/sub-attaq/pics/big/explosion/submarine/step3.png Binary files differindex 2cca1e80fe..2cca1e80fe 100644 --- a/examples/animation/sub-attaq/pics/big/explosion/submarine/step3.png +++ b/demos/sub-attaq/pics/big/explosion/submarine/step3.png diff --git a/examples/animation/sub-attaq/pics/big/explosion/submarine/step4.png b/demos/sub-attaq/pics/big/explosion/submarine/step4.png Binary files differindex 82100a8260..82100a8260 100644 --- a/examples/animation/sub-attaq/pics/big/explosion/submarine/step4.png +++ b/demos/sub-attaq/pics/big/explosion/submarine/step4.png diff --git a/examples/animation/sub-attaq/pics/big/submarine.png b/demos/sub-attaq/pics/big/submarine.png Binary files differindex df435dc47d..df435dc47d 100644 --- a/examples/animation/sub-attaq/pics/big/submarine.png +++ b/demos/sub-attaq/pics/big/submarine.png diff --git a/examples/animation/sub-attaq/pics/big/surface.png b/demos/sub-attaq/pics/big/surface.png Binary files differindex 4eba29e9cd..4eba29e9cd 100644 --- a/examples/animation/sub-attaq/pics/big/surface.png +++ b/demos/sub-attaq/pics/big/surface.png diff --git a/examples/animation/sub-attaq/pics/big/torpedo.png b/demos/sub-attaq/pics/big/torpedo.png Binary files differindex f9c26873f1..f9c26873f1 100644 --- a/examples/animation/sub-attaq/pics/big/torpedo.png +++ b/demos/sub-attaq/pics/big/torpedo.png diff --git a/examples/animation/sub-attaq/pics/scalable/background-n810.svg b/demos/sub-attaq/pics/scalable/background-n810.svg index ece9f7aaf1..ece9f7aaf1 100644 --- a/examples/animation/sub-attaq/pics/scalable/background-n810.svg +++ b/demos/sub-attaq/pics/scalable/background-n810.svg diff --git a/examples/animation/sub-attaq/pics/scalable/background.svg b/demos/sub-attaq/pics/scalable/background.svg index 0be268010e..0be268010e 100644 --- a/examples/animation/sub-attaq/pics/scalable/background.svg +++ b/demos/sub-attaq/pics/scalable/background.svg diff --git a/examples/animation/sub-attaq/pics/scalable/boat.svg b/demos/sub-attaq/pics/scalable/boat.svg index 5298821ba8..5298821ba8 100644 --- a/examples/animation/sub-attaq/pics/scalable/boat.svg +++ b/demos/sub-attaq/pics/scalable/boat.svg diff --git a/examples/animation/sub-attaq/pics/scalable/bomb.svg b/demos/sub-attaq/pics/scalable/bomb.svg index 294771a6dd..294771a6dd 100644 --- a/examples/animation/sub-attaq/pics/scalable/bomb.svg +++ b/demos/sub-attaq/pics/scalable/bomb.svg diff --git a/examples/animation/sub-attaq/pics/scalable/sand.svg b/demos/sub-attaq/pics/scalable/sand.svg index 8af11b7a66..8af11b7a66 100644 --- a/examples/animation/sub-attaq/pics/scalable/sand.svg +++ b/demos/sub-attaq/pics/scalable/sand.svg diff --git a/examples/animation/sub-attaq/pics/scalable/see.svg b/demos/sub-attaq/pics/scalable/see.svg index 0666691215..0666691215 100644 --- a/examples/animation/sub-attaq/pics/scalable/see.svg +++ b/demos/sub-attaq/pics/scalable/see.svg diff --git a/examples/animation/sub-attaq/pics/scalable/sky.svg b/demos/sub-attaq/pics/scalable/sky.svg index 1546c087a7..1546c087a7 100644 --- a/examples/animation/sub-attaq/pics/scalable/sky.svg +++ b/demos/sub-attaq/pics/scalable/sky.svg diff --git a/examples/animation/sub-attaq/pics/scalable/sub-attaq.svg b/demos/sub-attaq/pics/scalable/sub-attaq.svg index b075179b46..b075179b46 100644 --- a/examples/animation/sub-attaq/pics/scalable/sub-attaq.svg +++ b/demos/sub-attaq/pics/scalable/sub-attaq.svg diff --git a/examples/animation/sub-attaq/pics/scalable/submarine.svg b/demos/sub-attaq/pics/scalable/submarine.svg index 8a0ffddbca..8a0ffddbca 100644 --- a/examples/animation/sub-attaq/pics/scalable/submarine.svg +++ b/demos/sub-attaq/pics/scalable/submarine.svg diff --git a/examples/animation/sub-attaq/pics/scalable/surface.svg b/demos/sub-attaq/pics/scalable/surface.svg index 40ed239638..40ed239638 100644 --- a/examples/animation/sub-attaq/pics/scalable/surface.svg +++ b/demos/sub-attaq/pics/scalable/surface.svg diff --git a/examples/animation/sub-attaq/pics/scalable/torpedo.svg b/demos/sub-attaq/pics/scalable/torpedo.svg index 48e429d2bf..48e429d2bf 100644 --- a/examples/animation/sub-attaq/pics/scalable/torpedo.svg +++ b/demos/sub-attaq/pics/scalable/torpedo.svg diff --git a/examples/animation/sub-attaq/pics/small/background.png b/demos/sub-attaq/pics/small/background.png Binary files differindex 5ad3db660a..5ad3db660a 100644 --- a/examples/animation/sub-attaq/pics/small/background.png +++ b/demos/sub-attaq/pics/small/background.png diff --git a/examples/animation/sub-attaq/pics/small/boat.png b/demos/sub-attaq/pics/small/boat.png Binary files differindex 114ccc310e..114ccc310e 100644 --- a/examples/animation/sub-attaq/pics/small/boat.png +++ b/demos/sub-attaq/pics/small/boat.png diff --git a/examples/animation/sub-attaq/pics/small/bomb.png b/demos/sub-attaq/pics/small/bomb.png Binary files differindex 3af5f2f29c..3af5f2f29c 100644 --- a/examples/animation/sub-attaq/pics/small/bomb.png +++ b/demos/sub-attaq/pics/small/bomb.png diff --git a/examples/animation/sub-attaq/pics/small/submarine.png b/demos/sub-attaq/pics/small/submarine.png Binary files differindex 0c0c350600..0c0c350600 100644 --- a/examples/animation/sub-attaq/pics/small/submarine.png +++ b/demos/sub-attaq/pics/small/submarine.png diff --git a/examples/animation/sub-attaq/pics/small/surface.png b/demos/sub-attaq/pics/small/surface.png Binary files differindex 06d0e47a5c..06d0e47a5c 100644 --- a/examples/animation/sub-attaq/pics/small/surface.png +++ b/demos/sub-attaq/pics/small/surface.png diff --git a/examples/animation/sub-attaq/pics/small/torpedo.png b/demos/sub-attaq/pics/small/torpedo.png Binary files differindex f9c26873f1..f9c26873f1 100644 --- a/examples/animation/sub-attaq/pics/small/torpedo.png +++ b/demos/sub-attaq/pics/small/torpedo.png diff --git a/examples/animation/sub-attaq/pics/welcome/logo-a.png b/demos/sub-attaq/pics/welcome/logo-a.png Binary files differindex 67dd76dac0..67dd76dac0 100644 --- a/examples/animation/sub-attaq/pics/welcome/logo-a.png +++ b/demos/sub-attaq/pics/welcome/logo-a.png diff --git a/examples/animation/sub-attaq/pics/welcome/logo-a2.png b/demos/sub-attaq/pics/welcome/logo-a2.png Binary files differindex 17668b07de..17668b07de 100644 --- a/examples/animation/sub-attaq/pics/welcome/logo-a2.png +++ b/demos/sub-attaq/pics/welcome/logo-a2.png diff --git a/examples/animation/sub-attaq/pics/welcome/logo-b.png b/demos/sub-attaq/pics/welcome/logo-b.png Binary files differindex cf6c04560b..cf6c04560b 100644 --- a/examples/animation/sub-attaq/pics/welcome/logo-b.png +++ b/demos/sub-attaq/pics/welcome/logo-b.png diff --git a/examples/animation/sub-attaq/pics/welcome/logo-dash.png b/demos/sub-attaq/pics/welcome/logo-dash.png Binary files differindex 219233ce6b..219233ce6b 100644 --- a/examples/animation/sub-attaq/pics/welcome/logo-dash.png +++ b/demos/sub-attaq/pics/welcome/logo-dash.png diff --git a/examples/animation/sub-attaq/pics/welcome/logo-excl.png b/demos/sub-attaq/pics/welcome/logo-excl.png Binary files differindex 8dd0a2eb86..8dd0a2eb86 100644 --- a/examples/animation/sub-attaq/pics/welcome/logo-excl.png +++ b/demos/sub-attaq/pics/welcome/logo-excl.png diff --git a/examples/animation/sub-attaq/pics/welcome/logo-q.png b/demos/sub-attaq/pics/welcome/logo-q.png Binary files differindex 86e588d4d8..86e588d4d8 100644 --- a/examples/animation/sub-attaq/pics/welcome/logo-q.png +++ b/demos/sub-attaq/pics/welcome/logo-q.png diff --git a/examples/animation/sub-attaq/pics/welcome/logo-s.png b/demos/sub-attaq/pics/welcome/logo-s.png Binary files differindex 7b6a36e93a..7b6a36e93a 100644 --- a/examples/animation/sub-attaq/pics/welcome/logo-s.png +++ b/demos/sub-attaq/pics/welcome/logo-s.png diff --git a/examples/animation/sub-attaq/pics/welcome/logo-t.png b/demos/sub-attaq/pics/welcome/logo-t.png Binary files differindex b2e3526bea..b2e3526bea 100644 --- a/examples/animation/sub-attaq/pics/welcome/logo-t.png +++ b/demos/sub-attaq/pics/welcome/logo-t.png diff --git a/examples/animation/sub-attaq/pics/welcome/logo-t2.png b/demos/sub-attaq/pics/welcome/logo-t2.png Binary files differindex b11a77886e..b11a77886e 100644 --- a/examples/animation/sub-attaq/pics/welcome/logo-t2.png +++ b/demos/sub-attaq/pics/welcome/logo-t2.png diff --git a/examples/animation/sub-attaq/pics/welcome/logo-u.png b/demos/sub-attaq/pics/welcome/logo-u.png Binary files differindex 24eede887a..24eede887a 100644 --- a/examples/animation/sub-attaq/pics/welcome/logo-u.png +++ b/demos/sub-attaq/pics/welcome/logo-u.png diff --git a/examples/animation/sub-attaq/pixmapitem.cpp b/demos/sub-attaq/pixmapitem.cpp index ed0f075529..ed0f075529 100644 --- a/examples/animation/sub-attaq/pixmapitem.cpp +++ b/demos/sub-attaq/pixmapitem.cpp diff --git a/examples/animation/sub-attaq/pixmapitem.h b/demos/sub-attaq/pixmapitem.h index e32973e1dd..e32973e1dd 100644 --- a/examples/animation/sub-attaq/pixmapitem.h +++ b/demos/sub-attaq/pixmapitem.h diff --git a/examples/animation/sub-attaq/progressitem.cpp b/demos/sub-attaq/progressitem.cpp index 9ccaa72d8d..9ccaa72d8d 100644 --- a/examples/animation/sub-attaq/progressitem.cpp +++ b/demos/sub-attaq/progressitem.cpp diff --git a/examples/animation/sub-attaq/progressitem.h b/demos/sub-attaq/progressitem.h index 7be57c9a2d..7be57c9a2d 100644 --- a/examples/animation/sub-attaq/progressitem.h +++ b/demos/sub-attaq/progressitem.h diff --git a/examples/animation/sub-attaq/qanimationstate.cpp b/demos/sub-attaq/qanimationstate.cpp index 4e6df565ca..4e6df565ca 100644 --- a/examples/animation/sub-attaq/qanimationstate.cpp +++ b/demos/sub-attaq/qanimationstate.cpp diff --git a/examples/animation/sub-attaq/qanimationstate.h b/demos/sub-attaq/qanimationstate.h index 6c5b565f8a..6c5b565f8a 100644 --- a/examples/animation/sub-attaq/qanimationstate.h +++ b/demos/sub-attaq/qanimationstate.h diff --git a/examples/animation/sub-attaq/states.cpp b/demos/sub-attaq/states.cpp index d63737f52f..d63737f52f 100644 --- a/examples/animation/sub-attaq/states.cpp +++ b/demos/sub-attaq/states.cpp diff --git a/examples/animation/sub-attaq/states.h b/demos/sub-attaq/states.h index c3d81e7aba..c3d81e7aba 100644 --- a/examples/animation/sub-attaq/states.h +++ b/demos/sub-attaq/states.h diff --git a/examples/animation/sub-attaq/sub-attaq.pro b/demos/sub-attaq/sub-attaq.pro index d13a0998b6..ad1327d506 100644 --- a/examples/animation/sub-attaq/sub-attaq.pro +++ b/demos/sub-attaq/sub-attaq.pro @@ -30,7 +30,8 @@ SOURCES += boat.cpp \ RESOURCES += subattaq.qrc # install -target.path = $$[QT_INSTALL_EXAMPLES]/animation/sub-attaq +target.path = $$[QT_INSTALL_DEMOS]/animation/sub-attaq sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS sub-attaq.pro pics -sources.path = $$[QT_INSTALL_EXAMPLES]/animation/sub-attaq +sources.path = $$[QT_INSTALL_DEMOS]/animation/sub-attaq INSTALLS += target sources + diff --git a/examples/animation/sub-attaq/subattaq.qrc b/demos/sub-attaq/subattaq.qrc index 80a3af11cc..80a3af11cc 100644 --- a/examples/animation/sub-attaq/subattaq.qrc +++ b/demos/sub-attaq/subattaq.qrc diff --git a/examples/animation/sub-attaq/submarine.cpp b/demos/sub-attaq/submarine.cpp index 78a9539896..78a9539896 100644 --- a/examples/animation/sub-attaq/submarine.cpp +++ b/demos/sub-attaq/submarine.cpp diff --git a/examples/animation/sub-attaq/submarine.h b/demos/sub-attaq/submarine.h index 481e81633a..481e81633a 100644 --- a/examples/animation/sub-attaq/submarine.h +++ b/demos/sub-attaq/submarine.h diff --git a/examples/animation/sub-attaq/submarine_p.h b/demos/sub-attaq/submarine_p.h index e8df877e8b..e8df877e8b 100644 --- a/examples/animation/sub-attaq/submarine_p.h +++ b/demos/sub-attaq/submarine_p.h diff --git a/examples/animation/sub-attaq/torpedo.cpp b/demos/sub-attaq/torpedo.cpp index fe79488c54..fe79488c54 100644 --- a/examples/animation/sub-attaq/torpedo.cpp +++ b/demos/sub-attaq/torpedo.cpp diff --git a/examples/animation/sub-attaq/torpedo.h b/demos/sub-attaq/torpedo.h index c44037fbe5..c44037fbe5 100644 --- a/examples/animation/sub-attaq/torpedo.h +++ b/demos/sub-attaq/torpedo.h diff --git a/doc/src/demos/sub-attaq.qdoc b/doc/src/demos/sub-attaq.qdoc new file mode 100644 index 0000000000..6bbf763e2a --- /dev/null +++ b/doc/src/demos/sub-attaq.qdoc @@ -0,0 +1,54 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \example demos/sub-attaq + \title Sub-Attaq + + This demo shows Qt's ability to combine \l{The Animation Framework}{the animation framework} + and \l{The State Machine Framework}{the state machine framework} to create a game. + + \image sub-attaq-demo.png + + The purpose of the game is to destroy all submarines to win the current level. + The boat can be controlled using left and right keys. To fire a bomb you can press + up and down keys. +*/ diff --git a/doc/src/images/sub-attaq-demo.png b/doc/src/images/sub-attaq-demo.png Binary files differnew file mode 100644 index 0000000000..5a35ec6ee2 --- /dev/null +++ b/doc/src/images/sub-attaq-demo.png diff --git a/examples/animation/animation.pro b/examples/animation/animation.pro index 9a2874b1f7..c72c5329e8 100644 --- a/examples/animation/animation.pro +++ b/examples/animation/animation.pro @@ -7,7 +7,6 @@ SUBDIRS += \ moveblocks \ states \ stickman \ - sub-attaq # install target.path = $$[QT_INSTALL_EXAMPLES]/animation diff --git a/examples/animation/sub-attaq/data.xml b/examples/animation/sub-attaq/data.xml deleted file mode 100644 index 41d4754011..0000000000 --- a/examples/animation/sub-attaq/data.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<subattaq> - <submarines> - <submarine type="0" points="10" name="Q1" /> - <submarine type="1" points="20" name="Q2" /> - </submarines> - <levels> - <level id="0" name="Seaman recruit"> - <subinstance type="0" nb="2"/> - </level> - <level id="1" name="Seaman apprentice"> - <subinstance type="0" nb="4"/> - </level> - </levels> -</subattaq> |