Merge lp:~dinko-metalac/sudoku-app/bug-fix-1231700 into lp:sudoku-app

[Dinko Osmankovic]

--fixes lp:1231700

Bug fix for #1231700

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

FAILED: Continuous integration, rev:115
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~dinko-metalac/sudoku-app/bug-fix-1231700/+merge/188236/+edit-commit-message

http://91.189.93.70:8080/job/sudoku-app-ci/23/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/555
    SUCCESS: http://91.189.93.70:8080/job/sudoku-app-precise-amd64-ci/23
    SUCCESS: http://91.189.93.70:8080/job/sudoku-app-quantal-amd64-ci/23
    SUCCESS: http://91.189.93.70:8080/job/sudoku-app-raring-amd64-ci/23
    SUCCESS: http://91.189.93.70:8080/job/sudoku-app-saucy-amd64-ci/23

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:116
http://91.189.93.70:8080/job/sudoku-app-ci/25/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/557
    SUCCESS: http://91.189.93.70:8080/job/sudoku-app-precise-amd64-ci/25
    SUCCESS: http://91.189.93.70:8080/job/sudoku-app-quantal-amd64-ci/25
    SUCCESS: http://91.189.93.70:8080/job/sudoku-app-raring-amd64-ci/25
    SUCCESS: http://91.189.93.70:8080/job/sudoku-app-saucy-amd64-ci/25

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

review: Approve (continuous-integration)

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

review: Approve (continuous-integration)

=== modified file 'sudoku-app.qml'
--- sudoku-app.qml	2013-09-11 09:21:47 +0000
+++ sudoku-app.qml	2013-09-29 21:08:52 +0000
@@ -259,6 +259,9 @@
             randomnumber += 17;
             sudokuBlocksGrid.createNewGame(81 - randomnumber);
             break;
+        case 4:
+            PopupUtils.open(newGameComponent)
+            break;
         }
     }
 
@@ -345,7 +348,7 @@
                             sudokuBlocksGrid.createNewGame(81 - randomnumber);
                             PopupUtils.close(newGameDialogue)
                             sudokuBlocksGrid.gameDifficulty = 0
-                            toolbar.opened = false;
+                            //toolbar.opened = false;
                         }
                     }
                     NewGameSelectionButton {
@@ -362,7 +365,7 @@
                             sudokuBlocksGrid.createNewGame(81 - randomnumber);
                             PopupUtils.close(newGameDialogue)
                             sudokuBlocksGrid.gameDifficulty = 1
-                            toolbar.opened = false;
+                            //toolbar.opened = false;
                         }
                     }
                     NewGameSelectionButton {
@@ -379,7 +382,7 @@
                             sudokuBlocksGrid.createNewGame(81 - randomnumber);
                             PopupUtils.close(newGameDialogue)
                             sudokuBlocksGrid.gameDifficulty = 2
-                            toolbar.opened = false;
+                            //toolbar.opened = false;
                         }
                     }
                     NewGameSelectionButton {
@@ -396,7 +399,7 @@
                             sudokuBlocksGrid.createNewGame(81 - randomnumber);
                             PopupUtils.close(newGameDialogue)
                             sudokuBlocksGrid.gameDifficulty = 3
-                            toolbar.opened = false;
+                            //toolbar.opened = false;
                         }
                     }
 
@@ -561,6 +564,7 @@
             page: Page {
 
                 tools: ToolbarItems {
+                    opened: true
                     ToolbarButton {
                         objectName: "newgamebutton"
                         action: Action {
@@ -570,9 +574,9 @@
                                 if(gameFinishedRectangle.visible) gameFinishedRectangle.visible = false;
                                 //print("new block distance:", blockDistance);
                                 //createNewGame()
-                                if (settingsTab.difficultyIndex == 4)
-                                    PopupUtils.open(newGameComponent)
-                                else
+                                //if (settingsTab.difficultyIndex == 4)
+                                //    PopupUtils.open(newGameComponent)
+                                //else
                                     createNewGame()
                             }
                         }