From 534832f54676c1e25ded47916ee49ac2181fc1c6 Mon Sep 17 00:00:00 2001
From: Max <max.gruetzner@libelle13.de>
Date: Fri, 30 Nov 2018 20:58:24 +0100
Subject: [PATCH] made one stateMachine in calculator

---
 Calculator.qml                                      | 13 +++++++++----
 CalculatorEndPage.qml => CalculatorGameOverPage.qml |  0
 main.qml                                            |  1 -
 qml.qrc                                             |  2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)
 rename CalculatorEndPage.qml => CalculatorGameOverPage.qml (100%)

diff --git a/Calculator.qml b/Calculator.qml
index 2d0e12f..fe22c59 100644
--- a/Calculator.qml
+++ b/Calculator.qml
@@ -42,7 +42,7 @@ Item {
             name: "ending"
             PropertyChanges {
                 target: calculatorStack
-                currPage: calculatorEndPageComp
+                currPage: calculatorGameOverPageComp
             }
         }
     ]
@@ -74,9 +74,8 @@ Item {
         }
 
         Component {
-            id: calculatorEndPageComp
-            CalculatorEndPage {
-                id: calculatorEndPage
+            id: calculatorGameOverPageComp
+            CalculatorGameOverPage {
             }
         }
 
@@ -142,4 +141,10 @@ Item {
             calculator.endPageVisibility = true
         }
     }
+
+    function setState(state) {
+        if (state === "starting") {
+        }
+        calculator.state = state
+    }
 }
diff --git a/CalculatorEndPage.qml b/CalculatorGameOverPage.qml
similarity index 100%
rename from CalculatorEndPage.qml
rename to CalculatorGameOverPage.qml
diff --git a/main.qml b/main.qml
index b61d54f..3296c17 100644
--- a/main.qml
+++ b/main.qml
@@ -36,7 +36,6 @@ Window {
                 PropertyChanges {
                     target: mainStack
                     currPage: calculatorPageComp
-
                 }
             }
         ]
diff --git a/qml.qrc b/qml.qrc
index 5194cc2..253605d 100644
--- a/qml.qrc
+++ b/qml.qrc
@@ -5,7 +5,7 @@
         <file>StartPage.qml</file>
         <file>CalculatorMainPage.qml</file>
         <file>CalculatorStartPage.qml</file>
-        <file>CalculatorEndPage.qml</file>
+        <file>CalculatorGameOverPage.qml</file>
         <file>Calculator.qml</file>
     </qresource>
 </RCC>