Merge lp:~dinko-metalac/sudoku-app/fix-for-1356344 into lp:sudoku-app

[Dinko Osmankovic]

Fix for bug #1356344

Fix for bug #1356344

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:259
http://91.189.93.70:8080/job/sudoku-app-ci/119/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1615
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1615/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/sudoku-app-utopic-amd64-ci/29

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/sudoku-app-ci/119/rebuild

review: Approve (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'components/BigBlock.qml'
--- components/BigBlock.qml	2014-08-08 22:12:23 +0000
+++ components/BigBlock.qml	2014-08-19 10:49:38 +0000
@@ -7,7 +7,6 @@
 UbuntuShape {
     width: 3*blockSize + 5*blockDistance
     height: 3*blockSize + 5*blockDistance
-    color: UbuntuColors.warmGrey
     id: block
     Rectangle {
         height: parent.height - units.dp(6)

=== modified file 'components/SudokuBlocksGrid.qml'
--- components/SudokuBlocksGrid.qml	2014-08-08 22:12:23 +0000
+++ components/SudokuBlocksGrid.qml	2014-08-19 10:49:38 +0000
@@ -529,6 +529,7 @@
                     id: blocks
                     BigBlock {
                         id: block
+                        color: index % 2 == 0 ? UbuntuColors.warmGrey : Qt.lighter(UbuntuColors.warmGrey, 1.15)
                     }
                 }
             }

=== modified file 'js/localStorage.js'
--- js/localStorage.js	2014-04-08 21:18:51 +0000
+++ js/localStorage.js	2014-08-19 10:49:38 +0000
@@ -8,6 +8,9 @@
 
 function initialize() {
     var db = getDatabase();
+    var fname = i18n.tr("Sudoku")
+    var lname = i18n.tr("User")
+
     db.transaction(
                 function(tx) {
                     // Create the settings table if it doesn't already exist
@@ -20,7 +23,7 @@
                     tx.executeSql('CREATE TABLE IF NOT EXISTS profiles(id INTEGER PRIMARY KEY AUTOINCREMENT, first_name TEXT, last_name TEXT, UNIQUE(first_name, last_name) ON CONFLICT ROLLBACK)');
                     //print("profile table created.")
 
-                    tx.executeSql('INSERT OR IGNORE INTO profiles VALUES (null,?,?);', ["Sudoku","User"]);
+                    tx.executeSql('INSERT OR IGNORE INTO profiles VALUES (null,?,?);', [fname, lname]);
                     tx.executeSql('CREATE TABLE IF NOT EXISTS scores(id INTEGER PRIMARY KEY AUTOINCREMENT, profile_id INTEGER, score INTEGER NOT NULL, game_date DATE, FOREIGN KEY(profile_id) REFERENCES profiles(id))');
                     //print("scores table created.")
 

=== modified file 'sudoku-app.qml'
--- sudoku-app.qml	2014-08-11 10:39:57 +0000
+++ sudoku-app.qml	2014-08-19 10:49:38 +0000
@@ -193,7 +193,6 @@
     }
 
     function insertNewGameScore(userId, score) {
-        print(userId,score)
         Settings.insertNewScore(userId, score)
     }
 
@@ -207,7 +206,7 @@
         highscoresHeaderText = i18n.tr("<b>Best scores for all players</b>");
         for(var i = 0; i < allScores.length; i++) {
             var rowItem = allScores[i];
-            print("ROW ",rowItem)
+            //print("ROW ",rowItem)
             var firstName = Settings.getUserFirstName(rowItem[0]);
             var lastName = Settings.getUserLastName(rowItem[0]);
             //res.push([dbItem.first_name, dbItem.last_name, dbItem.score])
@@ -620,7 +619,7 @@
         settingsTab.difficultyIndex = parseInt(Settings.getSetting("Difficulty"));
         if (settingsTab.difficultyIndex < 0)
             settingsTab.difficultyIndex = 0
-        print(settingsTab.difficultyIndex)
+        //print(settingsTab.difficultyIndex)
         //print(Settings.getSetting("DisableHints"));
         settingsTab.disableHintsChecked = Settings.getSetting("DisableHints") == "true" ? true : false;
         settingsTab.disableVibrationsChecked = Settings.getSetting("DisableVibrations") == "true" ? true : false;