Heavy renaming and 0-check fix

Author: marvinborner

.gitignore

@@ -0,0 +1 @@
+*.user

BinaryFun.pro.user

@@ -1,8 +1,8 @@
 [Desktop Entry]
 Type=Application
 X-Nemo-Application-Type=silica-qt5
-Icon=BinaryFun
-Exec=BinaryFun
+Icon=harbour-binaryfun
+Exec=harbour-binaryfun
 Name=Binary Fun
 # translation example:
 # your app name in German locale (de)

BinaryFun.desktop renamed to harbour-binaryfun.desktop

@@ -10,23 +10,23 @@
 #   - translation filenames have to be changed
 
 # The name of your application
-TARGET = BinaryFun
+TARGET = harbour-binaryfun
 
 CONFIG += sailfishapp
 
-SOURCES += src/BinaryFun.cpp
+SOURCES += src/harbour-binaryfun.cpp
 
-DISTFILES += qml/BinaryFun.qml \
+DISTFILES += qml/harbour-binaryfun.qml \
     qml/Bit.qml \
     qml/cover/CoverPage.qml \
     qml/pages/Game.qml \
     qml/pages/Menu.qml \
-    rpm/BinaryFun.changes.in \
-    rpm/BinaryFun.changes.run.in \
-    rpm/BinaryFun.spec \
-    rpm/BinaryFun.yaml \
+    rpm/harbour-binaryfun.changes.in \
+    rpm/harbour-binaryfun.changes.run.in \
+    rpm/harbour-binaryfun.spec \
+    rpm/harbour-binaryfun.yaml \
     translations/*.ts \
-    BinaryFun.desktop \
+    harbour-binaryfun.desktop \
     qml/pages/LeaderBoard.qml
 
 SAILFISHAPP_ICONS = 86x86 108x108 128x128 172x172
@@ -39,4 +39,4 @@ CONFIG += sailfishapp_i18n
 # planning to localize your app, remember to comment out the
 # following TRANSLATIONS line. And also do not forget to
 # modify the localized app name in the the .desktop file.
-TRANSLATIONS += translations/BinaryFun-de.ts
+TRANSLATIONS += translations/harbour-binaryfun-de.ts

BinaryFun.pro renamed to harbour-binaryfun.pro

@@ -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;

icons/108x108/BinaryFun.png renamed to icons/108x108/harbour-binaryfun.png

@@ -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,22 +47,24 @@ 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;
                     }
 
                     correct[near / (bits + 1) - 1] = 0;
                 }
 
                 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;
+                    }
                 }
             }
 

icons/128x128/BinaryFun.png renamed to icons/128x128/harbour-binaryfun.png

@@ -3,7 +3,7 @@ import Sailfish.Silica 1.0
 
 Page {
     id: page
-    allowedOrientations: Orientation.All
+    allowedOrientations: Orientation.Portrait
 
     SilicaFlickable {
         anchors.fill: parent

icons/172x172/BinaryFun.png renamed to icons/172x172/harbour-binaryfun.png

@@ -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});
                     }

icons/86x86/BinaryFun.png renamed to icons/86x86/harbour-binaryfun.png

@@ -3,7 +3,7 @@
 # Generated by: spectacle version 0.27
 # 
 
-Name:       BinaryFun
+Name:       harbour-binaryfun
 
 # >> macros
 # << macros
@@ -19,7 +19,7 @@ Group:      Qt/Qt
 License:    LICENSE
 URL:        http://example.org/
 Source0:    %{name}-%{version}.tar.bz2
-Source100:  BinaryFun.yaml
+Source100:  harbour-binaryfun.yaml
 Requires:   sailfishsilica-qt5 >= 0.10.9
 BuildRequires:  pkgconfig(sailfishapp) >= 1.0.2
 BuildRequires:  pkgconfig(Qt5Core)

qml/Bit.qml

@@ -1,4 +1,4 @@
-Name: BinaryFun
+Name: harbour-binaryfun
 Summary: An awesome binary game
 Version: 0.1.1
 Release: 1

qml/BinaryFun.qml renamed to qml/harbour-binaryfun.qml

@@ -6,7 +6,7 @@
 
 int main(int argc, char *argv[])
 {
-    // SailfishApp::main() will display "qml/BinaryFun.qml", if you need more
+    // SailfishApp::main() will display "qml/harbour-binaryfun.qml", if you need more
     // control over initialization, you can use:
     //
     //   - SailfishApp::application(int, char *[]) to get the QGuiApplication *

qml/pages/Game.qml

@@ -5,51 +5,55 @@
     <name>CoverPage</name>
     <message>
         <source>Binary Fun</source>
-        <translation type="unfinished">Binary Fun</translation>
+        <translation type="unfinished">Binär-Spaß</translation>
     </message>
 </context>
 <context>
     <name>Game</name>
     <message>
         <source>Binary Fun</source>
-        <translation type="unfinished">Binary Fun</translation>
+        <translation>Binär-Spaß</translation>
     </message>
     <message>
         <source>Play again!</source>
-        <translation type="unfinished"></translation>
+        <translation>Nochmal!</translation>
+    </message>
+    <message>
+        <source>Not bad!</source>
+        <translation>Nicht schlecht!</translation>
     </message>
 </context>
 <context>
     <name>LeaderBoard</name>
     <message>
         <source>Under Construction!</source>
-        <translation type="unfinished"></translation>
+        <translation>Im Aufbau!</translation>
     </message>
 </context>
 <context>
     <name>Menu</name>
     <message>
         <source>Binary Fun</source>
-        <translation type="unfinished">Binary Fun</translation>
+        <translation>Binär-Spaß</translation>
     </message>
     <message>
         <source>Easy (4 Bit)</source>
-        <translation type="unfinished"></translation>
+        <translation>Einfach (4 Bit)</translation>
     </message>
     <message>
         <source>Medium (6 Bit)</source>
-        <translation type="unfinished"></translation>
+        <translation>Mittel (6 Bit)</translation>
     </message>
     <message>
         <source>Hard (8 Bit)</source>
-        <translation type="unfinished"></translation>
+        <translation>Schwer (8 Bit)</translation>
     </message>
     <message>
         <source>Very easy (2 Bit)</source>
-        <translation type="unfinished"></translation>
+        <translation>Sehr einfach (2 Bit)</translation>
     </message>
     <message>
-        <source>Godlike (10 Bit)</source>
+        <source>God-like (10 Bit)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

qml/pages/LeaderBoard.qml

@@ -18,6 +18,10 @@
         <source>Play again!</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Not bad!</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LeaderBoard</name>
@@ -49,7 +53,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Godlike (10 Bit)</source>
+        <source>God-like (10 Bit)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>