Sudoku App

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

  1. fix-for-1347292
  2. Merge into trunk
Proposed by Dinko Osmankovic
Status: Merged
Approved by: Dinko Osmankovic
Approved revision: 254
Merged at revision: 253
Proposed branch: lp:~dinko-metalac/sudoku-app/fix-for-1347292
Merge into: lp:sudoku-app
Diff against target: 225 lines (+54/-51)
5 files modified
apparmor/sudoku.json (+1/-1)
components/AboutTab.qml (+13/-12)
components/AddProfileDialog.qml (+18/-19)
components/HighscoresTab.qml (+2/-0)
components/ManageProfileDialog.qml (+20/-19)
To merge this branch: bzr merge lp:~dinko-metalac/sudoku-app/fix-for-1347292
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+229748@code.launchpad.net

Commit message

Fix for bug #1347292

Description of the change

Fix for bug #1347292

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

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)
Revision history for this message
Dinko Osmankovic (dinko-metalac) wrote :

Does anyone know why is this failing?

lp:~dinko-metalac/sudoku-app/fix-for-1347292 updated
254. By Dinko Osmankovic <email address hidden>

Will add fix for highscores later

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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)
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 '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 @@
4 "usermetrics"4 "usermetrics"
5 ],5 ],
6 "policy_version": 1.26 "policy_version": 1.2
7}7}
8\ No newline at end of file8\ No newline at end of file
99
=== 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 @@
11import UserMetrics 0.111import UserMetrics 0.1
1212
13Tab {13Tab {
14 objectName: "aboutTab"
14 page: Page {15 page: Page {
15 Layouts {16 Layouts {
16 id: aboutTabLayout17 id: aboutTabLayout
@@ -27,7 +28,7 @@
27 leftMargin: mainView.width*0.128 leftMargin: mainView.width*0.1
28 top: parent.top29 top: parent.top
29 topMargin: mainView.height*0.230 topMargin: mainView.height*0.2
30 31
31 }32 }
32 spacing: units.gu(5)33 spacing: units.gu(5)
33 ItemLayout {34 ItemLayout {
@@ -36,7 +37,7 @@
36 property real maxWidth: units.gu(80)37 property real maxWidth: units.gu(80)
37 width: Math.min(parent.width, maxWidth)/238 width: Math.min(parent.width, maxWidth)/2
38 height: Math.min(parent.width, maxWidth)/239 height: Math.min(parent.width, maxWidth)/2
39 40
40 }41 }
41 Column {42 Column {
42 //height: iconTabletItem.height43 //height: iconTabletItem.height
@@ -64,10 +65,10 @@
64 }65 }
65 }66 }
66 }67 }
67 68
68 69
69 ]70 ]
70 71
71 Column {72 Column {
72 id: aboutColumn;73 id: aboutColumn;
73 spacing: units.gu(3)74 spacing: units.gu(3)
@@ -87,7 +88,7 @@
87 source: "../icons/about.png"88 source: "../icons/about.png"
88 smooth: true89 smooth: true
89 fillMode: Image.PreserveAspectFit90 fillMode: Image.PreserveAspectFit
90 91
91 }92 }
92 }93 }
93 Grid {94 Grid {
@@ -99,7 +100,7 @@
99 Label {100 Label {
100 objectName: "authorLabel"101 objectName: "authorLabel"
101 text: i18n.tr("Author(s): ")102 text: i18n.tr("Author(s): ")
102 103
103 }104 }
104 Label {105 Label {
105 objectName: "authors"106 objectName: "authors"
@@ -115,9 +116,9 @@
115 font.bold: true;116 font.bold: true;
116 text: "dinko.metalac@gmail.com"117 text: "dinko.metalac@gmail.com"
117 }118 }
118 119
119 }120 }
120 121
121 Row {122 Row {
122 id: homepage;123 id: homepage;
123 anchors.horizontalCenter: parent.horizontalCenter;124 anchors.horizontalCenter: parent.horizontalCenter;
@@ -149,12 +150,12 @@
149 objectName: "yearLabel"150 objectName: "yearLabel"
150 font.bold: true;151 font.bold: true;
151 text: "2013"152 text: "2013"
152 153
153 154
154 }155 }
155 }156 }
156 }157 }
157 158
158 }159 }
159 }160 }
160}161}
161162
=== 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 @@
25 color: "#AEA79F"25 color: "#AEA79F"
26 anchors.horizontalCenter: parent.horizontalCenter26 anchors.horizontalCenter: parent.horizontalCenter
27 TextField {27 TextField {
28 objectName: "Firstname"
29 id:firstnameField
30 anchors.fill: parent
31 placeholderText: i18n.tr("Firstname")
32 color: "white"
33 onFocusChanged: {
34 if (firstnameField.focus)
35 color = UbuntuColors.warmGrey
36 }
37 }
38 }
39 UbuntuShape{
40 width: parent.width - units.gu(4)
41 height: mainView.height/18
42 radius: "medium"
43 color: "#AEA79F"
44 anchors.horizontalCenter: parent.horizontalCenter
45 TextField {
28 objectName: "Lastname"46 objectName: "Lastname"
29 id:lastnameField47 id:lastnameField
30 anchors.fill: parent48 anchors.fill: parent
@@ -36,25 +54,6 @@
36 }54 }
37 }55 }
38 }56 }
39 UbuntuShape{
40 width: parent.width - units.gu(4)
41 height: mainView.height/18
42 radius: "medium"
43 color: "#AEA79F"
44 anchors.horizontalCenter: parent.horizontalCenter
45 TextField {
46 objectName: "Firstname"
47 id:firstnameField
48 anchors.fill: parent
49 placeholderText: i18n.tr("Firstname")
50 color: "white"
51 onFocusChanged: {
52 if (firstnameField.focus)
53 color = UbuntuColors.warmGrey
54 }
55 }
56 }
57
5857
59 Row{58 Row{
60 width: parent.width59 width: parent.width
6160
=== 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 @@
1212
13Tab {13Tab {
1414
15 //property alias highscoresModel: highscoresModel
16
15 page: Page {17 page: Page {
16 tools: ToolbarItems {18 tools: ToolbarItems {
17 ToolbarButton {19 ToolbarButton {
1820
=== 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 @@
26 color: "#AEA79F"26 color: "#AEA79F"
27 anchors.horizontalCenter: parent.horizontalCenter27 anchors.horizontalCenter: parent.horizontalCenter
28 TextField {28 TextField {
29 id:firstnameField
30 anchors.fill: parent
31 //placeholderText: i18n.tr("Firstname")
32 text: Settings.getUserFirstName(editUserId)
33 color: "white"
34 onFocusChanged: {
35 if (firstnameField.focus)
36 firstnameField.color = "#333333"
37 else firstnameField.color = "white"
38 }
39 }
40 }
41 UbuntuShape {
42 width: parent.width - units.gu(4)
43 height: mainView.height/18
44 radius: "medium"
45 color: "#AEA79F"
46 anchors.horizontalCenter: parent.horizontalCenter
47 TextField {
29 id:lastnameField48 id:lastnameField
30 text: Settings.getUserLastName(editUserId)49 text: Settings.getUserLastName(editUserId)
31 anchors.fill: parent50 anchors.fill: parent
@@ -38,25 +57,7 @@
38 }57 }
39 }58 }
40 }59 }
41 UbuntuShape {60
42 width: parent.width - units.gu(4)
43 height: mainView.height/18
44 radius: "medium"
45 color: "#AEA79F"
46 anchors.horizontalCenter: parent.horizontalCenter
47 TextField {
48 id:firstnameField
49 anchors.fill: parent
50 //placeholderText: i18n.tr("Firstname")
51 text: Settings.getUserFirstName(editUserId)
52 color: "white"
53 onFocusChanged: {
54 if (firstnameField.focus)
55 firstnameField.color = "#333333"
56 else firstnameField.color = "white"
57 }
58 }
59 }
6061
6162
62 Row{63 Row{

Subscribers

People subscribed via source and target branches