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

[Dinko Osmankovic]

Fix for bug #1347292

Fix for bug #1347292

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

FAILED: Continuous integration, rev:253
http://91.189.93.70:8080/job/sudoku-app-ci/113/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1308
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1308/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/sudoku-app-utopic-amd64-ci/23

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

review: Needs Fixing (continuous-integration)

[Dinko Osmankovic (dinko-metalac)]

Does anyone know why is this failing?

[lp:~dinko-metalac/sudoku-app/fix-for-1347292]

254. By Dinko Osmankovic <email address hidden> on 2014-08-06

Will add fix for highscores later

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

PASSED: Continuous integration, rev:254
http://91.189.93.70:8080/job/sudoku-app-ci/114/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1311
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1311/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/sudoku-app-utopic-amd64-ci/24

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

review: Approve (continuous-integration)

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

review: Approve (continuous-integration)

=== modified file 'apparmor/sudoku.json'
--- apparmor/sudoku.json	2014-07-02 12:19:35 +0000
+++ apparmor/sudoku.json	2014-08-06 10:05:36 +0000
@@ -4,4 +4,4 @@
         "usermetrics"
     ],
     "policy_version": 1.2
-}
+}
\ No newline at end of file

=== modified file 'components/AboutTab.qml'
--- components/AboutTab.qml	2014-05-02 13:43:56 +0000
+++ components/AboutTab.qml	2014-08-06 10:05:36 +0000
@@ -11,6 +11,7 @@
 import UserMetrics 0.1
 
 Tab {
+    objectName: "aboutTab"
     page: Page {
         Layouts {
             id: aboutTabLayout
@@ -27,7 +28,7 @@
                             leftMargin: mainView.width*0.1
                             top: parent.top
                             topMargin: mainView.height*0.2
-                            
+
                         }
                         spacing: units.gu(5)
                         ItemLayout {
@@ -36,7 +37,7 @@
                             property real maxWidth: units.gu(80)
                             width: Math.min(parent.width, maxWidth)/2
                             height: Math.min(parent.width, maxWidth)/2
-                            
+
                         }
                         Column {
                             //height: iconTabletItem.height
@@ -64,10 +65,10 @@
                         }
                     }
                 }
-                
-                
+
+
             ]
-            
+
             Column {
                 id: aboutColumn;
                 spacing: units.gu(3)
@@ -87,7 +88,7 @@
                         source: "../icons/about.png"
                         smooth: true
                         fillMode: Image.PreserveAspectFit
-                        
+
                     }
                 }
                 Grid {
@@ -99,7 +100,7 @@
                     Label {
                         objectName: "authorLabel"
                         text: i18n.tr("Author(s): ")
-                        
+
                     }
                     Label {
                         objectName: "authors"
@@ -115,9 +116,9 @@
                         font.bold: true;
                         text: "[e-mail]"
                     }
-                    
+
                 }
-                
+
                 Row {
                     id: homepage;
                     anchors.horizontalCenter: parent.horizontalCenter;
@@ -149,12 +150,12 @@
                         objectName: "yearLabel"
                         font.bold: true;
                         text: "2013"
-                        
-                        
+
+
                     }
                 }
             }
-            
+
         }
     }
 }

=== modified file 'components/AddProfileDialog.qml'
--- components/AddProfileDialog.qml	2014-03-18 22:55:40 +0000
+++ components/AddProfileDialog.qml	2014-08-06 10:05:36 +0000
@@ -25,6 +25,24 @@
                 color: "#AEA79F"
                 anchors.horizontalCenter: parent.horizontalCenter
                 TextField {
+                    objectName: "Firstname"
+                    id:firstnameField
+                    anchors.fill: parent
+                    placeholderText: i18n.tr("Firstname")
+                    color: "white"
+                    onFocusChanged: {
+                        if (firstnameField.focus)
+                            color = UbuntuColors.warmGrey
+                    }
+                }
+            }
+            UbuntuShape{
+                width: parent.width - units.gu(4)
+                height: mainView.height/18
+                radius: "medium"
+                color: "#AEA79F"
+                anchors.horizontalCenter: parent.horizontalCenter
+                TextField {
                     objectName: "Lastname"
                     id:lastnameField
                     anchors.fill: parent
@@ -36,25 +54,6 @@
                     }
                 }
             }
-            UbuntuShape{
-                width: parent.width - units.gu(4)
-                height: mainView.height/18
-                radius: "medium"
-                color: "#AEA79F"
-                anchors.horizontalCenter: parent.horizontalCenter
-                TextField {
-                    objectName: "Firstname"
-                    id:firstnameField
-                    anchors.fill: parent
-                    placeholderText: i18n.tr("Firstname")
-                    color: "white"
-                    onFocusChanged: {
-                        if (firstnameField.focus)
-                            color = UbuntuColors.warmGrey
-                    }
-                }
-            }
-
 
             Row{
                 width: parent.width

=== modified file 'components/HighscoresTab.qml'
--- components/HighscoresTab.qml	2014-06-12 11:38:44 +0000
+++ components/HighscoresTab.qml	2014-08-06 10:05:36 +0000
@@ -12,6 +12,8 @@
 
 Tab {
 
+    //property alias highscoresModel: highscoresModel
+
     page: Page {
         tools: ToolbarItems {
             ToolbarButton {

=== modified file 'components/ManageProfileDialog.qml'
--- components/ManageProfileDialog.qml	2014-03-19 08:38:14 +0000
+++ components/ManageProfileDialog.qml	2014-08-06 10:05:36 +0000
@@ -26,6 +26,25 @@
                 color: "#AEA79F"
                 anchors.horizontalCenter: parent.horizontalCenter
                 TextField {
+                    id:firstnameField
+                    anchors.fill: parent
+                    //placeholderText: i18n.tr("Firstname")
+                    text: Settings.getUserFirstName(editUserId)
+                    color: "white"
+                    onFocusChanged: {
+                        if (firstnameField.focus)
+                            firstnameField.color = "#333333"
+                        else firstnameField.color = "white"
+                    }
+                }
+            }
+            UbuntuShape {
+                width: parent.width - units.gu(4)
+                height: mainView.height/18
+                radius: "medium"
+                color: "#AEA79F"
+                anchors.horizontalCenter: parent.horizontalCenter
+                TextField {
                     id:lastnameField
                     text: Settings.getUserLastName(editUserId)
                     anchors.fill: parent
@@ -38,25 +57,7 @@
                     }
                 }
             }
-            UbuntuShape {
-                width: parent.width - units.gu(4)
-                height: mainView.height/18
-                radius: "medium"
-                color: "#AEA79F"
-                anchors.horizontalCenter: parent.horizontalCenter
-                TextField {
-                    id:firstnameField
-                    anchors.fill: parent
-                    //placeholderText: i18n.tr("Firstname")
-                    text: Settings.getUserFirstName(editUserId)
-                    color: "white"
-                    onFocusChanged: {
-                        if (firstnameField.focus)
-                            firstnameField.color = "#333333"
-                        else firstnameField.color = "white"
-                    }
-                }
-            }
+
 
 
             Row{