Heavy renaming and 0-check fix

5 files changed, 17 insertions, 11 deletions

diff --git a/qml/Bit.qml b/qml/Bit.qml
index be6d0f6..6563e73 100644
--- a/qml/Bit.qml
+++ b/qml/Bit.qml
@@ -37,12 +37,16 @@ Loader {
                     var indices = root.matrix.slice(0, bits);
                     var transformed = [];
                     indices.forEach(function(elem) {
-                        transformed.unshift((pad((parseInt(elem) >>> 0).toString(2), bits))[grid.row - 1]);
+                        transformed.push((pad((parseInt(elem) >>> 0).toString(2), bits))[grid.row - 1]);
                     });
 
                     var transformed_num = parseInt(transformed.join(""), 2);
                     this.text = transformed_num;
                     root.matrix[index] = transformed_num;
+                    if (transformed_num === 0) { // A rather dumb fix.
+                        root.check(index - 1);
+                        root.check(index - 1);
+                    }
                 } else if (index !== bits){
                     var num = Math.floor(Math.random() * (Math.pow(2, bits) - 1)) + 1;
                     this.text = num;
diff --git a/qml/BinaryFun.qml b/qml/harbour-binaryfun.qml
index 9378223..9378223 100644
--- a/qml/BinaryFun.qml
+++ b/qml/harbour-binaryfun.qml
diff --git a/qml/pages/Game.qml b/qml/pages/Game.qml
index 8f95f58..3ab037d 100644
--- a/qml/pages/Game.qml
+++ b/qml/pages/Game.qml
@@ -6,7 +6,7 @@ Page {
     property int bits: 0 // gets passed by previous page
 
     id: page
-    allowedOrientations: Orientation.All
+    allowedOrientations: Orientation.Portrait
 
     SilicaFlickable {
         anchors.fill: parent
@@ -47,11 +47,11 @@ Page {
                 var near = nearest(index);
                 var current_score = parseInt(info_label.text.substr(0, info_label.text.indexOf('/')))
 
-                if (Number(root.matrix.slice(near, near + bits).join("")).toString() === (root.matrix[near + bits] >>> 0).toString(2)) {
+                if (Number(root.matrix.slice(near, near + bits).join("")).toString() === (root.matrix[near + bits] >>> 0).toString(2) && timer.running) {
                     correct[near / (bits + 1) - 1] = 1;
                     info_label.text = current_score + 1 + " / " + root.bits;
                 } else {
-                    if (correct[near / (bits + 1) - 1] === 1) {
+                    if (correct[near / (bits + 1) - 1] === 1 && timer.running) {
                         info_label.text = current_score - 1 + " / " + root.bits;
                     }
 
@@ -59,10 +59,12 @@ Page {
                 }
 
                 if (correct.filter(function(i) { return i === 1 }).length === bits) {
-                    info_label.text = "Yeeehaaw!";
-                    timer_label.text = ((new Date().getTime() - start_time) / 1000) + "s - Not bad!"
-                    timer.running = false;
-                    new_game.visible = true;
+                    if (timer.running) { // aka still playing
+                        info_label.text = "Yeeehaaw!";
+                        timer_label.text = ((new Date().getTime() - start_time) / 1000) + "s - " + qsTr("Not bad!");
+                        timer.running = false;
+                        new_game.visible = true;
+                    }
                 }
             }
 
diff --git a/qml/pages/LeaderBoard.qml b/qml/pages/LeaderBoard.qml
index 93dad0e..eae37b0 100644
--- a/qml/pages/LeaderBoard.qml
+++ b/qml/pages/LeaderBoard.qml
@@ -3,7 +3,7 @@ import Sailfish.Silica 1.0
 
 Page {
     id: page
-    allowedOrientations: Orientation.All
+    allowedOrientations: Orientation.Portrait
 
     SilicaFlickable {
         anchors.fill: parent
diff --git a/qml/pages/Menu.qml b/qml/pages/Menu.qml
index 39de258..1d93a0f 100644
--- a/qml/pages/Menu.qml
+++ b/qml/pages/Menu.qml
@@ -3,7 +3,7 @@ import Sailfish.Silica 1.0
 
 Page {
     id: page
-    allowedOrientations: Orientation.All
+    allowedOrientations: Orientation.Portrait
 
     SilicaFlickable {
         anchors.fill: parent
@@ -53,7 +53,7 @@ Page {
                 }
 
                 Button {
-                    text: qsTr("Godlike (10 Bit)")
+                    text: qsTr("God-like (10 Bit)")
                     onClicked: {
                         pageStack.push(Qt.resolvedUrl("Game.qml"), {bits: 10});
                     }