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

Proposed by Dinko Osmankovic
Status: Merged
Approved by: Dinko Osmankovic
Approved revision: 113
Merged at revision: 114
Proposed branch: lp:~dinko-metalac/sudoku-app/hud-fix
Merge into: lp:sudoku-app
Diff against target: 34 lines (+3/-3)
2 files modified
components/SudokuButtonsGrid.qml (+2/-2)
sudoku-app.qml (+1/-1)
To merge this branch: bzr merge lp:~dinko-metalac/sudoku-app/hud-fix
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+184960@code.launchpad.net

Commit message

HUD fix for hint revealing.

Description of the change

HUD fix for hint revealing.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'components/SudokuButtonsGrid.qml'
2--- components/SudokuButtonsGrid.qml 2013-09-04 19:21:18 +0000
3+++ components/SudokuButtonsGrid.qml 2013-09-11 08:52:06 +0000
4@@ -14,7 +14,7 @@
5
6 function redrawGrid()
7 {
8- console.log("on redraw grid")
9+ //console.log("on redraw grid")
10 for(var i=0; i < model; i++)
11 {
12 var row = Math.floor(i/9);
13@@ -28,7 +28,7 @@
14
15 if (testField == true)
16 {
17- console.log("index "+i+" row/col "+row+"/"+column)
18+ //console.log("index "+i+" row/col "+row+"/"+column)
19 buttonsGrid.itemAt(i).buttonColor = defaultNotAllowedColor;
20 }
21 else {
22
23=== modified file 'sudoku-app.qml'
24--- sudoku-app.qml 2013-09-04 19:21:18 +0000
25+++ sudoku-app.qml 2013-09-11 08:52:06 +0000
26@@ -48,7 +48,7 @@
27 Action {
28 text: i18n.tr("Reveal hint")
29 keywords: i18n.tr("Reveal hint")
30- enabled: false
31+ enabled: disableHints.checked
32 onTriggered: {
33 tabs.selectedTabIndex = 0
34 revealHint()

Subscribers

People subscribed via source and target branches