From 7af9769b48321376153b5ceee5c17050eb7d211e Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Thu, 23 Apr 2020 22:13:45 +0200
Subject: Added new help modes and fixed timing issues

---
 qml/pages/Menu.qml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'qml/pages/Menu.qml')

diff --git a/qml/pages/Menu.qml b/qml/pages/Menu.qml
index 6c1dd08..938d95c 100644
--- a/qml/pages/Menu.qml
+++ b/qml/pages/Menu.qml
@@ -7,19 +7,20 @@ Page {
 
     SilicaFlickable {
         anchors.fill: parent
-        contentHeight: column.height
+        contentHeight: menu.height
 
         PullDownMenu {
             MenuItem {
                 text: qsTr("Leaderboard")
-                onClicked: pageStack.push(Qt.resolvedUrl("LeaderBoard.qml"))
+                onClicked: pageStack.push(Qt.resolvedUrl("LeaderBoard.qml"), {modes: menu.help_modes})
             }
         }
 
         Column {
-            property bool bar: false
+            property var help: 0
+            property var help_modes: [qsTr("None"), qsTr("Counter"), qsTr("Bar"), qsTr("Both")]
 
-            id: column
+            id: menu
             width: page.width
             height: page.height
             spacing: Theme.paddingLarge
@@ -34,10 +35,9 @@ Page {
                 rowSpacing: Theme.paddingLarge * 2
 
                 Button {
-                    text: qsTr("Help bar") + ": 0"
+                    text: qsTr("Help") + ": " + menu.help_modes[menu.help]
                     onClicked: {
-                        column.bar = this.text.slice(-1) === "0";
-                        this.text = column.bar ? qsTr("Help bar") + ": 1" : qsTr("Help bar") + ": 0"
+                        menu.help = menu.help !== 3 ? ++menu.help : 0;
                     }
                 }
 
@@ -45,35 +45,35 @@ Page {
                     text: qsTr("Very easy (2 Bit)")
                     ButtonLayout.newLine: true
                     onClicked: {
-                        pageStack.push(Qt.resolvedUrl("Game.qml"), {bits: 2, help: column.bar});
+                        pageStack.push(Qt.resolvedUrl("Game.qml"), {bits: 2, help: menu.help, modes: menu.help_modes});
                     }
                 }
 
                 Button {
                     text: qsTr("Easy (4 Bit)")
                     onClicked: {
-                        pageStack.push(Qt.resolvedUrl("Game.qml"), {bits: 4, help: column.bar});
+                        pageStack.push(Qt.resolvedUrl("Game.qml"), {bits: 4, help: menu.help, modes: menu.help_modes});
                     }
                 }
 
                 Button {
                     text: qsTr("Medium (6 Bit)")
                     onClicked: {
-                        pageStack.push(Qt.resolvedUrl("Game.qml"), {bits: 6, help: column.bar});
+                        pageStack.push(Qt.resolvedUrl("Game.qml"), {bits: 6, help: menu.help, modes: menu.help_modes});
                     }
                 }
 
                 Button {
                     text: qsTr("Hard (8 Bit)")
                     onClicked: {
-                        pageStack.push(Qt.resolvedUrl("Game.qml"), {bits: 8, help: column.bar});
+                        pageStack.push(Qt.resolvedUrl("Game.qml"), {bits: 8, help: menu.help, modes: menu.help_modes});
                     }
                 }
 
                 Button {
                     text: qsTr("God-like (10 Bit)")
                     onClicked: {
-                        pageStack.push(Qt.resolvedUrl("Game.qml"), {bits: 10, help: column.bar});
+                        pageStack.push(Qt.resolvedUrl("Game.qml"), {bits: 10, help: menu.help, modes: menu.help_modes});
                     }
                 }
             }
-- 
cgit v1.2.3