Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-animations

18 files changed, 147 insertions, 37 deletions

diff --git a/examples/animation/animation.pro b/examples/animation/animation.pro
index d5121a1..0a57d3d 100644
--- a/examples/animation/animation.pro
+++ b/examples/animation/animation.pro
@@ -7,9 +7,6 @@ SUBDIRS          += \
                  example \
                  moveblocks \
                  padnavigator-ng \
-                 photobrowser \
-                 piemenu \
-                 selectbutton \
                  states \
                  stickman \
                  sub-attaq
diff --git a/examples/animation/moveblocks/main.cpp b/examples/animation/moveblocks/main.cpp
index 06ed3dd..0ce07fc 100644
--- a/examples/animation/moveblocks/main.cpp
+++ b/examples/animation/moveblocks/main.cpp
@@ -95,7 +95,7 @@ public:
     }
 
 protected:
-    virtual bool eventTest(QEvent *event) const
+    virtual bool eventTest(QEvent *event)
     {
         return (event->type() == QEvent::Type(StateSwitchEvent::StateSwitchType))
             && (static_cast<StateSwitchEvent *>(event)->rand() == m_rand);
diff --git a/examples/animation/stickman/lifecycle.cpp b/examples/animation/stickman/lifecycle.cpp
index b22af55..423d7ad 100644
--- a/examples/animation/stickman/lifecycle.cpp
+++ b/examples/animation/stickman/lifecycle.cpp
@@ -69,7 +69,7 @@ public:
     {
     }
 
-    virtual bool eventTest(QEvent *e) const
+    virtual bool eventTest(QEvent *e)
     {
         if (QSignalTransition::eventTest(e)) {
             QVariant key = static_cast<QSignalEvent*>(e)->arguments().at(0);
@@ -92,7 +92,7 @@ public:
         startTimer(1000);
     }
 
-    virtual bool eventTest(QEvent *e) const
+    virtual bool eventTest(QEvent *e)
     {
         return QEventTransition::eventTest(e) && ((qrand() % 50) == 0);
     }
diff --git a/examples/animation/sub-attaq/boat_p.h b/examples/animation/sub-attaq/boat_p.h
index 17fbe5c..6f03e48 100644
--- a/examples/animation/sub-attaq/boat_p.h
+++ b/examples/animation/sub-attaq/boat_p.h
@@ -67,7 +67,7 @@ public:
         this->key = key;
     }
 protected:
-    virtual bool eventTest(QEvent *event) const
+    virtual bool eventTest(QEvent *event)
     {
         Q_UNUSED(event);
         if (!QKeyEventTransition::eventTest(event))
@@ -93,7 +93,7 @@ public:
         this->key = key;
     }
 protected:
-    virtual bool eventTest(QEvent *event) const
+    virtual bool eventTest(QEvent *event)
     {
         Q_UNUSED(event);
         if (!QKeyEventTransition::eventTest(event))
@@ -131,7 +131,7 @@ public:
         this->key = key;
     }
 protected:
-    virtual bool eventTest(QEvent *event) const
+    virtual bool eventTest(QEvent *event)
     {
         Q_UNUSED(event);
         if (!QKeyEventTransition::eventTest(event))
diff --git a/examples/animation/sub-attaq/states.cpp b/examples/animation/sub-attaq/states.cpp
index c6af924..7650b0f 100644
--- a/examples/animation/sub-attaq/states.cpp
+++ b/examples/animation/sub-attaq/states.cpp
@@ -281,7 +281,7 @@ UpdateScoreTransition::UpdateScoreTransition(GraphicsScene *scene, PlayState *ga
 {
 }
 
-bool UpdateScoreTransition::eventTest(QEvent *event) const
+bool UpdateScoreTransition::eventTest(QEvent *event)
 {
     if (!QSignalTransition::eventTest(event))
         return false;
@@ -300,7 +300,7 @@ WinTransition::WinTransition(GraphicsScene *scene, PlayState *game, QAbstractSta
 {
 }
 
-bool WinTransition::eventTest(QEvent *event) const
+bool WinTransition::eventTest(QEvent *event)
 {
     if (!QSignalTransition::eventTest(event))
         return false;
@@ -319,7 +319,7 @@ CustomSpaceTransition::CustomSpaceTransition(QWidget *widget, PlayState *game, Q
 {
 }
 
-bool CustomSpaceTransition::eventTest(QEvent *event) const
+bool CustomSpaceTransition::eventTest(QEvent *event)
 {
     Q_UNUSED(event);
     if (!QKeyEventTransition::eventTest(event))
diff --git a/examples/animation/sub-attaq/states.h b/examples/animation/sub-attaq/states.h
index 27beb71..a1cb5ff 100644
--- a/examples/animation/sub-attaq/states.h
+++ b/examples/animation/sub-attaq/states.h
@@ -152,7 +152,7 @@ class UpdateScoreTransition : public QSignalTransition
 public:
     UpdateScoreTransition(GraphicsScene *scene, PlayState *game, QAbstractState *target);
 protected:
-    virtual bool eventTest(QEvent *event) const;
+    virtual bool eventTest(QEvent *event);
 private:
     PlayState * game;
     GraphicsScene *scene;
@@ -164,7 +164,7 @@ class WinTransition : public QSignalTransition
 public:
     WinTransition(GraphicsScene *scene, PlayState *game, QAbstractState *target);
 protected:
-    virtual bool eventTest(QEvent *event) const;
+    virtual bool eventTest(QEvent *event);
 private:
     PlayState * game;
     GraphicsScene *scene;
@@ -176,7 +176,7 @@ private:
 public:
     CustomSpaceTransition(QWidget *widget, PlayState *game, QEvent::Type type, int key);
 protected:
-    virtual bool eventTest(QEvent *event) const;
+    virtual bool eventTest(QEvent *event);
 private:
     PlayState *game;
     int key;
diff --git a/examples/statemachine/factorial/main.cpp b/examples/statemachine/factorial/main.cpp
index ae5928f..1065eb8 100644
--- a/examples/statemachine/factorial/main.cpp
+++ b/examples/statemachine/factorial/main.cpp
@@ -100,7 +100,7 @@ public:
         : QSignalTransition(fact, SIGNAL(xChanged(int))), m_fact(fact)
     {}
 
-    virtual bool eventTest(QEvent *e) const
+    virtual bool eventTest(QEvent *e)
     {
         if (!QSignalTransition::eventTest(e))
             return false;
@@ -130,7 +130,7 @@ public:
         : QSignalTransition(fact, SIGNAL(xChanged(int))), m_fact(fact)
     {}
 
-    virtual bool eventTest(QEvent *e) const
+    virtual bool eventTest(QEvent *e)
     {
         if (!QSignalTransition::eventTest(e))
             return false;
diff --git a/examples/statemachine/pingpong/main.cpp b/examples/statemachine/pingpong/main.cpp
index db66bfd..331627e 100644
--- a/examples/statemachine/pingpong/main.cpp
+++ b/examples/statemachine/pingpong/main.cpp
@@ -86,7 +86,7 @@ public:
     PongTransition() {}
 
 protected:
-    virtual bool eventTest(QEvent *e) const {
+    virtual bool eventTest(QEvent *e) {
         return (e->type() == QEvent::User+3);
     }
     virtual void onTransition(QEvent *)
@@ -104,7 +104,7 @@ public:
     PingTransition() {}
 
 protected:
-    virtual bool eventTest(QEvent *e) const {
+    virtual bool eventTest(QEvent *e) {
         return (e->type() == QEvent::User+2);
     }
     virtual void onTransition(QEvent *)
diff --git a/examples/statemachine/tankgame/gameovertransition.cpp b/examples/statemachine/tankgame/gameovertransition.cpp
new file mode 100644
index 0000000..cec786e
--- /dev/null
+++ b/examples/statemachine/tankgame/gameovertransition.cpp
@@ -0,0 +1,39 @@
+#include "gameovertransition.h"
+#include "tankitem.h"
+
+#include <QSignalEvent>
+#include <QSignalMapper>
+
+GameOverTransition::GameOverTransition(QAbstractState *targetState)
+    : QSignalTransition(new QSignalMapper(), SIGNAL(mapped(QObject*)))
+{
+    setTargetState(targetState);
+    
+    QSignalMapper *mapper = qobject_cast<QSignalMapper *>(senderObject());
+    mapper->setParent(this);
+}
+
+void GameOverTransition::addTankItem(TankItem *tankItem)
+{
+    m_tankItems.append(tankItem);
+
+    QSignalMapper *mapper = qobject_cast<QSignalMapper *>(senderObject());
+    mapper->setMapping(tankItem, tankItem);
+    connect(tankItem, SIGNAL(aboutToBeDestroyed()), mapper, SLOT(map()));
+}
+
+bool GameOverTransition::eventTest(QEvent *e)
+{
+    bool ret = QSignalTransition::eventTest(e);
+
+    if (ret) {
+        QSignalEvent *signalEvent = static_cast<QSignalEvent *>(e);
+        QObject *sender = qvariant_cast<QObject *>(signalEvent->arguments().at(0));
+        TankItem *tankItem = qobject_cast<TankItem *>(sender);
+        m_tankItems.removeAll(tankItem);
+
+        return m_tankItems.size() <= 1;
+    } else {
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/examples/statemachine/tankgame/gameovertransition.h b/examples/statemachine/tankgame/gameovertransition.h
new file mode 100644
index 0000000..9a86b83
--- /dev/null
+++ b/examples/statemachine/tankgame/gameovertransition.h
@@ -0,0 +1,22 @@
+#ifndef GAMEOVERTRANSITION_H
+#define GAMEOVERTRANSITION_H
+
+#include <QSignalTransition>
+
+class TankItem;
+class GameOverTransition: public QSignalTransition
+{
+    Q_OBJECT
+public:
+    GameOverTransition(QAbstractState *targetState);
+
+    void addTankItem(TankItem *tankItem);
+
+protected:
+    bool eventTest(QEvent *event);
+
+private:
+    QList<TankItem *> m_tankItems;
+};
+
+#endif
diff --git a/examples/statemachine/tankgame/mainwindow.cpp b/examples/statemachine/tankgame/mainwindow.cpp
index 870bc9c..fcc0325 100644
--- a/examples/statemachine/tankgame/mainwindow.cpp
+++ b/examples/statemachine/tankgame/mainwindow.cpp
@@ -2,6 +2,7 @@
 #include "tankitem.h"
 #include "rocketitem.h"
 #include "plugin.h"
+#include "gameovertransition.h"
 
 #include <QStateMachine>
 #include <QGraphicsView>
@@ -53,7 +54,7 @@ void MainWindow::init()
     {
         TankItem *item = new TankItem(this);
 
-        item->setPos(m_scene->sceneRect().topLeft() + QPointF(15.0, 15.0));
+        item->setPos(m_scene->sceneRect().topLeft() + QPointF(30.0, 30.0));
         item->setDirection(45.0);
         item->setColor(Qt::red);
 
@@ -63,7 +64,7 @@ void MainWindow::init()
     {
         TankItem *item = new TankItem(this);
 
-        item->setPos(m_scene->sceneRect().topRight() + QPointF(-15.0, 15.0));
+        item->setPos(m_scene->sceneRect().topRight() + QPointF(-30.0, 30.0));
         item->setDirection(135.0);
         item->setColor(Qt::green);
 
@@ -73,7 +74,7 @@ void MainWindow::init()
     {
         TankItem *item = new TankItem(this);
 
-        item->setPos(m_scene->sceneRect().bottomRight() + QPointF(-15.0, -15.0));
+        item->setPos(m_scene->sceneRect().bottomRight() + QPointF(-30.0, -30.0));
         item->setDirection(225.0);
         item->setColor(Qt::blue);
 
@@ -83,7 +84,7 @@ void MainWindow::init()
     {
         TankItem *item = new TankItem(this);
 
-        item->setPos(m_scene->sceneRect().bottomLeft() + QPointF(15.0, -15.0));
+        item->setPos(m_scene->sceneRect().bottomLeft() + QPointF(30.0, -30.0));
         item->setDirection(315.0);
         item->setColor(Qt::yellow);
 
@@ -125,20 +126,23 @@ void MainWindow::init()
     stoppedState->assignProperty(this, "started", false);
     m_machine->setInitialState(stoppedState);
 
-    QState *spawnsAvailable = new QState(stoppedState);
-    spawnsAvailable->setObjectName("spawnsAvailable");
+//! [5]
+    QState *spawnsAvailable = new QState(stoppedState);    
     spawnsAvailable->assignProperty(addTankAction, "enabled", true);
 
-    QState *noSpawnsAvailable = new QState(stoppedState);
-    noSpawnsAvailable->setObjectName("noSpawnsAvailable");
+    QState *noSpawnsAvailable = new QState(stoppedState);    
     noSpawnsAvailable->assignProperty(addTankAction, "enabled", false);
+//! [5]    
+    spawnsAvailable->setObjectName("spawnsAvailable");
+    noSpawnsAvailable->setObjectName("noSpawnsAvailable");
 
     spawnsAvailable->addTransition(this, SIGNAL(mapFull()), noSpawnsAvailable);
 
 //! [3]
-    QHistoryState *hs = new QHistoryState(stoppedState);
+    QHistoryState *hs = new QHistoryState(stoppedState);    
     hs->setDefaultState(spawnsAvailable);
 //! [3]
+    hs->setObjectName("hs");
 
     stoppedState->setInitialState(hs);
 
@@ -149,10 +153,18 @@ void MainWindow::init()
     m_runningState->assignProperty(addTankAction, "enabled", false);
     m_runningState->assignProperty(runGameAction, "enabled", false);
     m_runningState->assignProperty(stopGameAction, "enabled", true);
+
+    QState *gameOverState = new QState(m_machine->rootState());
+    gameOverState->setObjectName("gameOverState");
+    gameOverState->assignProperty(stopGameAction, "enabled", false);
+    connect(gameOverState, SIGNAL(entered()), this, SLOT(gameOver()));
         
     stoppedState->addTransition(runGameAction, SIGNAL(triggered()), m_runningState);
     m_runningState->addTransition(stopGameAction, SIGNAL(triggered()), stoppedState);
 
+    m_gameOverTransition = new GameOverTransition(gameOverState);
+    m_runningState->addTransition(m_gameOverTransition);
+
     QTimer *timer = new QTimer(this);
     timer->setInterval(100);
     connect(timer, SIGNAL(timeout()), this, SLOT(runStep()));
@@ -182,6 +194,22 @@ void MainWindow::runStep()
     }
 }
 
+void MainWindow::gameOver()
+{
+    QList<QGraphicsItem *> items = m_scene->items();
+
+    TankItem *lastTankStanding = 0;
+    foreach (QGraphicsItem *item, items) {
+        if (GameItem *gameItem = qgraphicsitem_cast<GameItem *>(item)) {
+            if (lastTankStanding = qobject_cast<TankItem *>(gameItem))
+                break;
+        }
+    }
+
+    QMessageBox::information(this, "Game over!", 
+        QString::fromLatin1("The tank played by '%1' has won!").arg(lastTankStanding->objectName()));
+}
+
 void MainWindow::addRocket()
 {
     TankItem *tankItem = qobject_cast<TankItem *>(sender());
@@ -244,21 +272,26 @@ void MainWindow::addTank()
         int idx = itemNames.indexOf(selectedName);
         if (Plugin *plugin = idx >= 0 ? items.at(idx) : 0) {
             TankItem *tankItem = m_spawns.takeLast();
+            tankItem->setObjectName(selectedName);
+            tankItem->setToolTip(selectedName);
             m_scene->addItem(tankItem);
             connect(tankItem, SIGNAL(cannonFired()), this, SLOT(addRocket()));
             if (m_spawns.isEmpty())
                 emit mapFull();
+
+            m_gameOverTransition->addTankItem(tankItem);
             
             QState *region = new QState(m_runningState);
+            region->setObjectName(QString::fromLatin1("region%1").arg(m_spawns.size()));
 //! [2]
             QState *pluginState = plugin->create(region, tankItem);
 //! [2]
             region->setInitialState(pluginState);
 
-
             // If the plugin has an error it is disabled
 //! [4]
             QState *errorState = new QState(region);
+            errorState->setObjectName(QString::fromLatin1("errorState%1").arg(m_spawns.size()));
             errorState->assignProperty(tankItem, "enabled", false);
             pluginState->setErrorState(errorState);
 //! [4]
diff --git a/examples/statemachine/tankgame/mainwindow.h b/examples/statemachine/tankgame/mainwindow.h
index 622dabe..40e1595 100644
--- a/examples/statemachine/tankgame/mainwindow.h
+++ b/examples/statemachine/tankgame/mainwindow.h
@@ -7,6 +7,7 @@
 class QGraphicsScene;
 class QStateMachine;
 class QState;
+class GameOverTransition;
 class TankItem;
 class MainWindow: public QMainWindow
 {
@@ -23,6 +24,7 @@ public slots:
     void addTank();
     void addRocket();
     void runStep();
+    void gameOver();
 
 signals:
     void mapFull();
@@ -35,6 +37,7 @@ private:
     
     QStateMachine *m_machine;
     QState *m_runningState;
+    GameOverTransition *m_gameOverTransition;
 
     QList<TankItem *> m_spawns;
     QTime m_time;
diff --git a/examples/statemachine/tankgame/tankgame.pro b/examples/statemachine/tankgame/tankgame.pro
index f7b0760..46cfe2e 100644
--- a/examples/statemachine/tankgame/tankgame.pro
+++ b/examples/statemachine/tankgame/tankgame.pro
@@ -8,6 +8,6 @@ DEPENDPATH += .
 INCLUDEPATH += C:/dev/kinetic/examples/statemachine/tankgame/. .
 
 # Input
-HEADERS += mainwindow.h plugin.h tankitem.h rocketitem.h gameitem.h
-SOURCES += main.cpp mainwindow.cpp tankitem.cpp rocketitem.cpp gameitem.cpp
+HEADERS += mainwindow.h plugin.h tankitem.h rocketitem.h gameitem.h gameovertransition.h
+SOURCES += main.cpp mainwindow.cpp tankitem.cpp rocketitem.cpp gameitem.cpp gameovertransition.cpp
 CONFIG += console
diff --git a/examples/statemachine/tankgame/tankitem.cpp b/examples/statemachine/tankgame/tankitem.cpp
index 5506a7e..c322d21 100644
--- a/examples/statemachine/tankgame/tankitem.cpp
+++ b/examples/statemachine/tankgame/tankitem.cpp
@@ -113,6 +113,7 @@ void TankItem::idle(qreal elapsed)
 
 void TankItem::hitByRocket()
 {
+    emit aboutToBeDestroyed();
     deleteLater();
 }
 
diff --git a/examples/statemachine/tankgame/tankitem.h b/examples/statemachine/tankgame/tankitem.h
index 66f05aa..9475397 100644
--- a/examples/statemachine/tankgame/tankitem.h
+++ b/examples/statemachine/tankgame/tankitem.h
@@ -41,6 +41,7 @@ signals:
     void collision(const QLineF &collidedLine);
     void actionCompleted();
     void cannonFired();
+    void aboutToBeDestroyed();
 
 public slots:
     void moveForwards(qreal length = 10.0);
diff --git a/examples/statemachine/tankgameplugins/seek_ai/seek_ai.h b/examples/statemachine/tankgameplugins/seek_ai/seek_ai.h
index 2835988..9d4aabc 100644
--- a/examples/statemachine/tankgameplugins/seek_ai/seek_ai.h
+++ b/examples/statemachine/tankgameplugins/seek_ai/seek_ai.h
@@ -81,7 +81,7 @@ public:
     }
 
 protected:
-    bool eventTest(QEvent *event) const
+    bool eventTest(QEvent *event)
     {
         bool b = QSignalTransition::eventTest(event);
         if (b) {
@@ -105,7 +105,7 @@ protected:
     }
 
 private:
-    mutable QLineF m_lastLine;
+    QLineF m_lastLine;
     QObject *m_tank;
     QState *m_turnTo;
 };
@@ -137,16 +137,20 @@ public:
     ChaseState(QObject *tank, QState *parentState = 0) : QState(parentState), m_tank(tank)
     {
         QState *fireCannon = new QState(this);
+        fireCannon->setObjectName("fireCannon");
         connect(fireCannon, SIGNAL(entered()), tank, SLOT(fireCannon()));
         setInitialState(fireCannon);
 
-        m_goToLocation = new GoToLocationState(this);
+        m_goToLocation = new GoToLocationState(tank, this);
+        m_goToLocation->setObjectName("goToLocation");
         fireCannon->addTransition(tank, SIGNAL(actionCompleted()), m_goToLocation);
 
         m_turnToDirection = new QState(this);
+        m_turnToDirection->setObjectName("turnToDirection");
         m_goToLocation->addTransition(tank, SIGNAL(actionCompleted()), m_turnToDirection);
 
         QFinalState *finalState = new QFinalState(this);
+        finalState->setObjectName("finalState");
         m_turnToDirection->addTransition(tank, SIGNAL(actionCompleted()), finalState);
     }
 
@@ -176,7 +180,7 @@ public:
     }
 
 protected:
-    bool eventTest(QEvent *event) const
+    bool eventTest(QEvent *event)
     {
         bool b = QSignalTransition::eventTest(event);
         if (b) {
diff --git a/examples/statemachine/tankgameplugins/spin_ai/spin_ai.h b/examples/statemachine/tankgameplugins/spin_ai/spin_ai.h
index a331a3e..d8d3d73 100644
--- a/examples/statemachine/tankgameplugins/spin_ai/spin_ai.h
+++ b/examples/statemachine/tankgameplugins/spin_ai/spin_ai.h
@@ -18,7 +18,7 @@ public:
 public slots:
     void spin() 
     {
-        m_tank->setProperty("direction", 90.0);
+        m_tank->setProperty("direction", m_tank->property("direction").toDouble() + 90.0);
     }
 
 protected:
@@ -28,6 +28,11 @@ protected:
         spin();        
     }
 
+    void onExit(QEvent *)
+    {
+        disconnect(m_tank, SIGNAL(actionCompleted()), this, SLOT(spin()));
+    }
+
 private:
     QObject *m_tank;
 
diff --git a/examples/statemachine/tankgameplugins/spin_ai_with_error/spin_ai_with_error.h b/examples/statemachine/tankgameplugins/spin_ai_with_error/spin_ai_with_error.h
index 5cfb364..456ba01 100644
--- a/examples/statemachine/tankgameplugins/spin_ai_with_error/spin_ai_with_error.h
+++ b/examples/statemachine/tankgameplugins/spin_ai_with_error/spin_ai_with_error.h
@@ -18,7 +18,7 @@ public:
 public slots:
     void spin() 
     {
-        m_tank->setProperty("direction", 90.0);
+        m_tank->setProperty("direction", m_tank->property("direction").toDouble() + 90.0);
     }
 
 protected:
@@ -28,6 +28,11 @@ protected:
         spin();        
     }
 
+    void onExit(QEvent *)
+    {
+        disconnect(m_tank, SIGNAL(actionCompleted()), this, SLOT(spin()));
+    }
+
 private:
     QObject *m_tank;