Merge lp:~vthompson/dropping-letters/fix-1196867 into lp:dropping-letters

[Victor Thompson]

* Disable tiles when game ends.
* Disable pause button when game ends.

* Disable tiles when game ends.
* Disable pause button when game ends.

[lp:~vthompson/dropping-letters/fix-1196867]

65. By Victor Thompson on 2014-09-16

Disable pause button if game has ended.

[Victor Thompson (vthompson)]

Disabled the pause button if the game has ended, otherwise the user can toggle the pause button after the game ends and letters continue to fall.

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

PASSED: Continuous integration, rev:65
http://91.189.93.70:8080/job/dropping-letters-ci/39/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/dropping-letters-utopic-amd64-ci/17
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2019
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2019/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/dropping-letters-ci/39/rebuild

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Hah! nice.

review: Approve

=== modified file 'dropping-letters.qml'
--- dropping-letters.qml	2014-09-13 18:26:27 +0000
+++ dropping-letters.qml	2014-09-16 04:34:07 +0000
@@ -28,6 +28,7 @@
         droptimer.start();
         toolbar.opened = false;
         game.paused = false;
+        game.ended = false;
     }
 
     Page {
@@ -54,7 +55,7 @@
                 objectName: "pause_game"
                 text: game.paused ? i18n.tr("Resume") : i18n.tr("Pause")
                 iconName: game.paused ? "media-playback-start": "media-playback-pause"
-                enabled: flipable.flipped
+                enabled: flipable.flipped && !game.ended
                 onTriggered: {
                     if (game.paused) {
                         droptimer.start();
@@ -545,6 +546,7 @@
                         lm.get(idx).letters.append({ letter: main.getRandomWeightedLetter() });
                         if (lm.get(idx).letters.count >= 10) {
                             droptimer.stop();
+                            game.ended = true;
                             if (volume.supportsMedia) {
                                 gameover.play();
                             }
@@ -562,6 +564,7 @@
                     id: game
                     objectName: "gametile"
                     property int squaresize: Math.min((flipable.width) / 7, (flipable.height - (flipable.minChromeHeight * 2)) / 10)
+                    property bool ended: false;
                     property bool paused: false;
                     anchors.top: topbar.bottom
                     anchors.bottom: bottombar.top
@@ -621,6 +624,7 @@
                                             color: "#ffffff"
                                         }
                                         MouseArea {
+                                            enabled: !game.ended
                                             anchors.fill: parent
                                             onClicked: {
                                                 if (!box.selected) {