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

Proposed by Dinko Osmankovic
Status: Merged
Approved by: Dinko Osmankovic
Approved revision: 180
Merged at revision: 180
Proposed branch: lp:~dinko-metalac/sudoku-app/bug-fix-1295928
Merge into: lp:sudoku-app
Diff against target: 38 lines (+18/-1)
1 file modified
sudoku-app.qml (+18/-1)
To merge this branch: bzr merge lp:~dinko-metalac/sudoku-app/bug-fix-1295928
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+212369@code.launchpad.net

Commit message

Fix for bug #1295928

Description of the change

Fix for bug #1295928

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
=== modified file 'sudoku-app.qml'
--- sudoku-app.qml 2014-03-20 08:25:38 +0000
+++ sudoku-app.qml 2014-03-24 09:39:16 +0000
@@ -919,6 +919,22 @@
919 ListModel {919 ListModel {
920 id: highscoresModel920 id: highscoresModel
921921
922 onDataChanged: {
923 var allScores = Settings.getAllScores()
924 highscoresModel.clear();
925 highscoresHeaderText = i18n.tr("<b>Best scores for all players</b>");
926 for(var i = 0; i < allScores.length; i++) {
927 var rowItem = allScores[i];
928 //print("ROW ",rowItem)
929 var firstName = Settings.getUserFirstName(rowItem[0]);
930 var lastName = Settings.getUserLastName(rowItem[0]);
931 //res.push([dbItem.first_name, dbItem.last_name, dbItem.score])
932 highscoresModel.append({'firstname': firstName,
933 'lastname': lastName,
934 'score': rowItem[1] });
935 }
936 }
937
922 /*ListElement {938 /*ListElement {
923 firstname: "Bill"939 firstname: "Bill"
924 lastname: "Smith"940 lastname: "Smith"
@@ -934,9 +950,10 @@
934 anchors.fill: parent950 anchors.fill: parent
935 clip: true951 clip: true
936 ListView {952 ListView {
953 id: highScoresListView
937 model: highscoresModel954 model: highscoresModel
938 width: parent.width955 width: parent.width
939 height:parent.height956 height:parent.height
940957
941 header: ListItem.Header {958 header: ListItem.Header {
942 id: highscoresHeader959 id: highscoresHeader

Subscribers

People subscribed via source and target branches