Merge lp:~mhall119/unity8/finish-tour into lp:unity8

[Michael Hall]

Add a little bit of text to the last step of the tour telling the user how to end it and get to their phone.

Add a little bit of text to the last step of the tour telling the user how to end it and get to their phone.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:274
http://jenkins.qa.ubuntu.com/job/unity8-ci/837/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2813
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/412
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1438
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/838
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/838/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/837
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2819
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2819/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2389
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/414
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/414/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/375
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/382

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/837/rebuild

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

Katie, you fine with this change?

[Michael Zanetti (mzanetti)]

There are two spaces "...phone. Tap..."

Intentional or typo?

review: Needs Information

[Katie Taylor (katie-t)]

Hello!

great idea. Can't see how to alter the text, but think it should be this: (remove "to finish the tour", replace with "to exit.")

"You have now mastered the edge gestures and can start using the phone. Tap anywhere to exit."

review: Needs Fixing (design)

[Michael Hall (mhall119)]

@Michael, old habit from when I first learned to type, two-spaced between sentences was "proper" back then.

@Katie, do you think it should be "to exit the tour"? If it's just "to exit" I'm concerned the user might think they were exiting more than just the tour.

I'm happy to make both changes though.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:275
http://jenkins.qa.ubuntu.com/job/unity8-ci/840/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2832
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/426
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1442
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/841
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/841/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/840
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2838
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2838/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2405
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/428
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/428/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/387
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/394

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/840/rebuild

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

lgtm. waiting for katie to answer last question.

[Katie Taylor (katie-t)]

Hello!

I've discussed it with Tingting (usability specialist) and we agree it should say "Tap anywhere to start." since we mention start using the phone in the previous sentence.

[Michael Zanetti (mzanetti)]

I guess the same question applies: "tap anywhere to start" or "tap anywhere to start using Ubuntu" (or something like that)

[Michael Zanetti (mzanetti)]

oh... just realized that the previous sentence says "start using your phone". we're good then.

@Michael: Please change it as suggested by Katie and Tingting and I'll approve.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:276
http://jenkins.qa.ubuntu.com/job/unity8-ci/856/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2889
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/470
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1461
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/857
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/857/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/856
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2895
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2895/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2456
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/472
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/472/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/422
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/430

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/856/rebuild

review: Needs Fixing (continuous-integration)

[Michael Hall (mhall119)]

Here are some possible ways of displaying this: http://ubuntuone.com/5rVPw9uOqj8UjfGZiNZQpj

[Michael Hall (mhall119)]

Screnshot of rev 277: http://ubuntuone.com/5t3mlKBIQ6emRN1VIbwPDy

[Michael Terry (mterry)]

Two spaces between sentences isn't proper anymore? I haven't unlearned that yet...

[Michael Zanetti (mzanetti)]

lgtm

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:277
http://jenkins.qa.ubuntu.com/job/unity8-ci/871/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2937
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/504
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1477
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/872
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/872/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/871
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2943
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2943/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2500
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/506
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/506/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/452
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/460

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/871/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/350/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/generic-cleanup-mbs/1971/console
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2952/console
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/518/console
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2958/console
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/520/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'Components/EdgeDemo.qml'
--- Components/EdgeDemo.qml	2013-08-28 19:59:50 +0000
+++ Components/EdgeDemo.qml	2013-09-03 14:26:03 +0000
@@ -218,8 +218,9 @@
             d.finalEdgeDemo = d.overlay.createObject(demo.underlay, {
                 "edge": "none",
                 "title": i18n.tr("Well done"),
-                "text": i18n.tr("You have now mastered the edge gestures and can start using the phone"),
+                "text": i18n.tr("You have now mastered the edge gestures and can start using the phone<br><br>Tap anywhere to start"),
                 "anchors.fill": demo.dash,
+                "showSkip": false,
             });
         }
         if (d.finalEdgeDemo) {

=== modified file 'Components/EdgeDemoOverlay.qml'
--- Components/EdgeDemoOverlay.qml	2013-08-27 13:46:35 +0000
+++ Components/EdgeDemoOverlay.qml	2013-09-03 14:26:03 +0000
@@ -44,6 +44,11 @@
     property alias skipText: skipLabel.text
 
     /*
+     * This is the visible status of the skip button.
+     */
+    property alias showSkip: skipLabel.visible
+
+    /*
      * Whether this demo is running currently.
      */
     readonly property bool active: available && visible