Merge lp:~fredoust/sudoku-app/fix-bug-1200732 into lp:sudoku-app

[Frédéric Delgado]

[lp:~fredoust/sudoku-app/fix-bug-1200732]

78. By Frédéric Delgado on 2013-07-12

Fix for bug 1200732 patch

[Dinko Osmankovic (dinko-metalac)]

review: Approve

[David Planella (dpm)]

Thanks a lot Frédéric!

Please remember to set the commit message in the merge proposal, otherwise Jenkins will fail. If you could also set the description, to understand what the change is about, that'd also be great.

Keep up the great work!

=== modified file 'components/SudokuBlocksGrid.qml'
--- components/SudokuBlocksGrid.qml	2013-07-12 07:56:21 +0000
+++ components/SudokuBlocksGrid.qml	2013-07-12 19:18:25 +0000
@@ -85,6 +85,7 @@
             grid.setValue(hintColumn, hintRow, solution.getValue(hintColumn, hintRow));
             buttonsGrid.itemAt(hintRow*9 + hintColumn).buttonText = solution.getValue(hintColumn, hintRow);
             buttonsGrid.itemAt(hintRow*9 + hintColumn).buttonColor = defaultHintColor;
+            buttonsGrid.itemAt(hintRow*9 + hintColumn).hinted = true;
         }
 
     }
@@ -175,6 +176,7 @@
                 buttonsGrid.itemAt(i*9 + j).boldText = boldText;
                 buttonsGrid.itemAt(i*9 + j).border.color = defaultBorderColor;
                 buttonsGrid.itemAt(i*9 + j).enabled = true;
+                buttonsGrid.itemAt(i*9 + j).hinted = false;
             }
         }
 
@@ -317,6 +319,7 @@
                                 grid.setValue(column,row, 0);
                                 buttonsGrid.itemAt(currentX).buttonColor = defaultColor;
                                 buttonsGrid.itemAt(currentX).boldText = false;
+                                 buttonsGrid.itemAt(currentX).hinted = false
                                 buttonsGrid.redrawGrid()
                                 PopupUtils.close(dialogue)
                             }
@@ -342,6 +345,7 @@
 
                                     onTriggered: {
                                         buttonsGrid.itemAt(currentX).buttonText = index+1
+                                        buttonsGrid.itemAt(currentX).hinted = false
                                         numberOfActions++;
 
                                         var row = Math.floor(currentX/9);

=== modified file 'components/SudokuButtonsGrid.qml'
--- components/SudokuButtonsGrid.qml	2013-07-05 21:36:31 +0000
+++ components/SudokuButtonsGrid.qml	2013-07-12 19:18:25 +0000
@@ -30,8 +30,13 @@
                     buttonsGrid.itemAt(i).buttonColor = defaultNotAllowedColor;
                 }
                 else {
-                    buttonsGrid.itemAt(i).buttonColor = defaultColor;
-                    buttonsGrid.itemAt(currentX).boldText = false;
+                    if(buttonsGrid.itemAt(i).hinted)
+                    {
+                        buttonsGrid.itemAt(i).buttonColor = defaultHintColor;
+                    }else{
+                        buttonsGrid.itemAt(i).buttonColor = defaultColor;
+                        buttonsGrid.itemAt(currentX).boldText = false;
+                    }
                 }
             }
         }
@@ -39,6 +44,9 @@
 
     SudokuButton {
         id: gridButton;
+
+        property bool hinted : false
+
         buttonText: "0";
         //width: units.gu(5);
         //height: units.gu(5);