Add calculator QML example

Change-Id: I225ace405a9afc62ba68079a53856a2567f678bd
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>

14 files changed, 341 insertions, 15 deletions

diff --git a/examples/scxml/calculator/calculator.scxml b/examples/scxml/calculator-common/statemachine.scxml
index 2b1e926..7971ee0 100644
--- a/examples/scxml/calculator/calculator.scxml
+++ b/examples/scxml/calculator-common/statemachine.scxml
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0"
-       initial="wrapper" datamodel="ecmascript" name="Calculator">
+       initial="wrapper" datamodel="ecmascript" name="CalculatorStateMachine">
     <datamodel>
          <data id="long_expr" />
          <data id="short_expr" />
diff --git a/examples/scxml/calculator-qml/Button.qml b/examples/scxml/calculator-qml/Button.qml
new file mode 100644
index 0000000..de973a5
--- /dev/null
+++ b/examples/scxml/calculator-qml/Button.qml
@@ -0,0 +1,81 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtScxml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.5
+
+Rectangle {
+    id: button
+    signal clicked
+    property alias text: text.text
+    border.width: 1
+    border.color: "white"
+    property real textHeight: height - 2
+    property real fontHeight: 0.3
+    property bool pressed: mouse.pressed
+
+    Text {
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.top: parent.top
+        height: parent.textHeight
+        horizontalAlignment: Text.AlignHCenter
+        verticalAlignment: Text.AlignVCenter
+        id: text
+        font.pixelSize: height * fontHeight
+        color: "#1b1c1d"
+        font.family: "Open Sans Regular"
+    }
+
+    MouseArea {
+        id: mouse
+        anchors.fill: parent
+        onClicked: button.clicked()
+    }
+}
diff --git a/examples/scxml/calculator-qml/calculator-qml.cpp b/examples/scxml/calculator-qml/calculator-qml.cpp
new file mode 100644
index 0000000..85b904e
--- /dev/null
+++ b/examples/scxml/calculator-qml/calculator-qml.cpp
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtScxml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QGuiApplication>
+#include <QQmlApplicationEngine>
+#include <QQmlContext>
+
+#include "statemachine.h"
+
+int main(int argc, char *argv[])
+{
+    QGuiApplication app(argc, argv);
+
+    qmlRegisterType<CalculatorStateMachine>("CalculatorStateMachine", 1, 0,
+                                            "CalculatorStateMachine");
+
+    QQmlApplicationEngine engine;
+    engine.load(QUrl(QStringLiteral("qrc:/calculator-qml.qml")));
+    if (engine.rootObjects().isEmpty())
+        return -1;
+
+    return app.exec();
+}
+
diff --git a/examples/scxml/calculator-qml/calculator-qml.pro b/examples/scxml/calculator-qml/calculator-qml.pro
new file mode 100644
index 0000000..6221576
--- /dev/null
+++ b/examples/scxml/calculator-qml/calculator-qml.pro
@@ -0,0 +1,15 @@
+QT += qml scxml
+
+CONFIG += c++11
+
+SOURCES += calculator-qml.cpp
+
+RESOURCES += calculator-qml.qrc
+
+STATECHARTS = ../calculator-common/statemachine.scxml
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/scxml/calculator-qml
+INSTALLS += target
+
+load(qscxmlc)
diff --git a/examples/scxml/calculator-qml/calculator-qml.qml b/examples/scxml/calculator-qml/calculator-qml.qml
new file mode 100644
index 0000000..ac60b5a
--- /dev/null
+++ b/examples/scxml/calculator-qml/calculator-qml.qml
@@ -0,0 +1,152 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtScxml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import CalculatorStateMachine 1.0
+import QtQuick 2.5
+import QtQuick.Window 2.0
+
+Window {
+    id: window
+    visible: true
+    width: 320
+    height: 480
+
+    CalculatorStateMachine {
+        id: statemachine
+        running: true
+        onEventOccurred: {
+            if (event.name === "updateDisplay")
+                resultText.text = event.data.display;
+        }
+    }
+
+    Rectangle {
+        id: resultArea
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.top: parent.top
+        height: parent.height * 3 / 8 - 10
+        border.color: "white"
+        border.width: 1
+        color: "#46a2da"
+        Text {
+            id: resultText
+            anchors.leftMargin: 5
+            anchors.rightMargin: 5
+            anchors.fill: parent
+            horizontalAlignment: Text.AlignRight
+            verticalAlignment: Text.AlignVCenter
+            text: "0"
+            color: "white"
+            font.pixelSize: window.height * 3 / 32
+        }
+    }
+
+    Item {
+        anchors.top: resultArea.bottom
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.bottom: parent.bottom
+
+        Repeater {
+            model: ["÷", "×", "+", "-"]
+            Button {
+                y: 0
+                x: index * width
+                width: parent.width / 4
+                height: parent.height / 5
+                color: pressed ? "#5caa15" : "#80c342"
+                text: modelData
+                fontHeight: 0.4
+                onClicked: statemachine.submitEvent(eventName)
+                property string eventName: {
+                    switch (text) {
+                    case "÷": return "OPER.DIV"
+                    case "×": return "OPER.STAR"
+                    case "+": return "OPER.PLUS"
+                    case "-": return "OPER.MINUS"
+                    }
+                }
+            }
+        }
+
+        Repeater {
+            model: ["7", "8", "9", "4", "5", "6", "1", "2", "3", "0", ".", "C"]
+            Button {
+                x: (index % 3) * width
+                y: Math.floor(index / 3 + 1) * height
+                width: parent.width / 4
+                height: parent.height / 5
+                color: pressed ? "#d6d6d6" : "#eeeeee"
+                text: modelData
+                onClicked: statemachine.submitEvent(eventName)
+                property string eventName: {
+                    switch (text) {
+                    case ".": return "POINT"
+                    case "C": return "C"
+                    default: return "DIGIT." + text
+                    }
+                }
+            }
+        }
+
+        Button {
+            x: 3 * width
+            y: parent.height / 5
+            textHeight: y - 2
+            fontHeight: 0.4
+            width: parent.width / 4
+            height: y * 4
+            color: pressed ? "#e0b91c" : "#face20"
+            text: "="
+            onClicked: statemachine.submitEvent("EQUALS")
+        }
+    }
+}
diff --git a/examples/scxml/calculator-qml/calculator-qml.qrc b/examples/scxml/calculator-qml/calculator-qml.qrc
new file mode 100644
index 0000000..55bc81c
--- /dev/null
+++ b/examples/scxml/calculator-qml/calculator-qml.qrc
@@ -0,0 +1,6 @@
+<RCC>
+    <qresource prefix="/">
+        <file>calculator-qml.qml</file>
+        <file>Button.qml</file>
+    </qresource>
+</RCC>
diff --git a/examples/scxml/calculator/main.cpp b/examples/scxml/calculator-widgets/calculator-widgets.cpp
index af51f8f..b127427 100644
--- a/examples/scxml/calculator/main.cpp
+++ b/examples/scxml/calculator-widgets/calculator-widgets.cpp
@@ -48,7 +48,7 @@
 **
 ****************************************************************************/
 
-#include "calculator.h"
+#include "statemachine.h"
 #include "mainwindow.h"
 
 #include <QApplication>
@@ -57,7 +57,7 @@ int main(int argc, char **argv)
 {
     QApplication app(argc, argv);
 
-    Calculator machine;
+    CalculatorStateMachine machine;
     MainWindow mainWindow(&machine);
 
     machine.start();
diff --git a/examples/scxml/calculator/calculator.pro b/examples/scxml/calculator-widgets/calculator-widgets.pro
index 9c0ef68..55880f1 100644
--- a/examples/scxml/calculator/calculator.pro
+++ b/examples/scxml/calculator-widgets/calculator-widgets.pro
@@ -2,10 +2,10 @@ QT += widgets scxml
 
 CONFIG += c++11
 
-STATECHARTS = calculator.scxml
+STATECHARTS = ../calculator-common/statemachine.scxml
 
 SOURCES += \
-    main.cpp \
+    calculator-widgets.cpp \
     mainwindow.cpp
 
 HEADERS += \
@@ -15,7 +15,7 @@ FORMS += \
     mainwindow.ui
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/scxml/calculator
+target.path = $$[QT_INSTALL_EXAMPLES]/scxml/calculator-widgets
 INSTALLS += target
 
 load(qscxmlc)
diff --git a/examples/scxml/calculator/doc/images/calculator.png b/examples/scxml/calculator-widgets/doc/images/calculator.png
index 443242a..443242a 100644
--- a/examples/scxml/calculator/doc/images/calculator.png
+++ b/examples/scxml/calculator-widgets/doc/images/calculator.png
diff --git a/examples/scxml/calculator/doc/src/calculator.qdoc b/examples/scxml/calculator-widgets/doc/src/calculator.qdoc
index e6e91c8..f92fbbd 100644
--- a/examples/scxml/calculator/doc/src/calculator.qdoc
+++ b/examples/scxml/calculator-widgets/doc/src/calculator.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example calculator
+    \example calculator-widgets
     \title Qt SCXML Calculator Example
     \ingroup examples-qtscxml
 
@@ -50,7 +50,7 @@
     We link against the Qt SCXML module by adding the following line to the
     \e calculator.pro file:
 
-    \quotefromfile calculator/calculator.pro
+    \quotefromfile calculator-widgets/calculator-widgets.pro
     \printuntil scxml
 
     We then specify the state machine to compile:
@@ -58,8 +58,8 @@
     \skipto STATECHARTS
     \printline calculator
 
-    We also tell qmake to run \c qscxmlc, which generates \e calculator.h and
-    \e calculator.cpp, and adds them to the \c HEADERS and \c SOURCES variables
+    We also tell qmake to run \c qscxmlc, which generates \e statemachine.h and
+    \e statemachine.cpp, and adds them to the \c HEADERS and \c SOURCES variables
     for compilation:
 
     \skipto load
@@ -67,10 +67,10 @@
 
     \section1 Instantiating the State Machine
 
-    We instantiate the generated \c Calculator class in the \e main.cpp file, as
-    follows:
+    We instantiate the generated \c CalculatorStateMachine class in the
+    \e main.cpp file, as follows:
 
-    \quotefromfile calculator/main.cpp
+    \quotefromfile calculator-widgets/calculator-widgets.cpp
     \skipto #include
     \printuntil }
 
@@ -79,7 +79,7 @@
     After instantiating the state machine, we can connect to the active
     properties of the states, as follows:
 
-    \quotefromfile calculator/mainwindow.cpp
+    \quotefromfile calculator-widgets/mainwindow.cpp
     \skipto connect
     \printuntil digit2
     \printuntil }
diff --git a/examples/scxml/calculator/mainwindow.cpp b/examples/scxml/calculator-widgets/mainwindow.cpp
index eacafaa..eacafaa 100644
--- a/examples/scxml/calculator/mainwindow.cpp
+++ b/examples/scxml/calculator-widgets/mainwindow.cpp
diff --git a/examples/scxml/calculator/mainwindow.h b/examples/scxml/calculator-widgets/mainwindow.h
index c8d77f3..c8d77f3 100644
--- a/examples/scxml/calculator/mainwindow.h
+++ b/examples/scxml/calculator-widgets/mainwindow.h
diff --git a/examples/scxml/calculator/mainwindow.ui b/examples/scxml/calculator-widgets/mainwindow.ui
index 8001ff1..8001ff1 100644
--- a/examples/scxml/calculator/mainwindow.ui
+++ b/examples/scxml/calculator-widgets/mainwindow.ui
diff --git a/examples/scxml/scxml.pro b/examples/scxml/scxml.pro
index 0ee3d2e..7a93fd4 100644
--- a/examples/scxml/scxml.pro
+++ b/examples/scxml/scxml.pro
@@ -6,11 +6,12 @@ qtHaveModule(widgets) {
     SUBDIRS +=  trafficlight-widgets-dynamic
     SUBDIRS +=  mediaplayer-widgets-static
     SUBDIRS +=  mediaplayer-widgets-dynamic
-    SUBDIRS +=  calculator
+    SUBDIRS +=  calculator-widgets
     SUBDIRS +=  pinball
 }
 
 qtHaveModule(qml) {
+    SUBDIRS +=  calculator-qml
     SUBDIRS +=  trafficlight-qml-static
     SUBDIRS +=  trafficlight-qml-dynamic
     SUBDIRS +=  mediaplayer-qml-static