Merge lp:~gang65/mines/additional-sizes into lp:mines

Proposed by Bartosz Kosiorek
Status: Needs review
Proposed branch: lp:~gang65/mines/additional-sizes
Merge into: lp:mines
Diff against target: 47 lines (+13/-4)
1 file modified
main.qml (+13/-4)
To merge this branch: bzr merge lp:~gang65/mines/additional-sizes
Reviewer Review Type Date Requested Status
Robert Ancell Disapprove
Review via email: mp+303207@code.launchpad.net

Commit message

Add medium size of he board

Description of the change

Add medium size of he board

To post a comment you must log in.
Revision history for this message
Robert Ancell (robert-ancell) wrote :

This doesn't just add a new size - it changes all the sizes...

review: Disapprove

Unmerged revisions

79. By Bartosz Kosiorek

Add new size of the board

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'main.qml'
--- main.qml 2016-01-03 07:32:56 +0000
+++ main.qml 2016-08-18 00:54:47 +0000
@@ -155,7 +155,7 @@
155 155
156 Item {156 Item {
157 anchors.fill: parent157 anchors.fill: parent
158 anchors.margins: units.gu (2)158 anchors.margins: units.gu (1)
159 MineGrid {159 MineGrid {
160 id: minefield160 id: minefield
161 anchors.horizontalCenter: parent.horizontalCenter161 anchors.horizontalCenter: parent.horizontalCenter
@@ -243,6 +243,9 @@
243 case "small":243 case "small":
244 // TRANSLATORS: Setting name for small minefield244 // TRANSLATORS: Setting name for small minefield
245 return i18n.tr ("Small")245 return i18n.tr ("Small")
246 case "medium":
247 // TRANSLATORS: Setting name for medium minefield
248 return i18n.tr ("Medium")
246 case "large":249 case "large":
247 // TRANSLATORS: Setting name for large minefield250 // TRANSLATORS: Setting name for large minefield
248 return i18n.tr ("Large")251 return i18n.tr ("Large")
@@ -266,15 +269,21 @@
266 id: field_size_model269 id: field_size_model
267 ListElement {270 ListElement {
268 name: "small"271 name: "small"
272 grid_width: 6
273 grid_height: 10
274 n_mines: 10
275 }
276 ListElement {
277 name: "medium"
269 grid_width: 8278 grid_width: 8
270 grid_height: 8279 grid_height: 12
271 n_mines: 10280 n_mines: 18
272 }281 }
273 ListElement {282 ListElement {
274 name: "large"283 name: "large"
275 grid_width: 10284 grid_width: 10
276 grid_height: 16285 grid_height: 16
277 n_mines: 25286 n_mines: 35
278 }287 }
279 }288 }
280 }289 }

Subscribers

People subscribed via source and target branches