git.iko.soy/unity8
on xenial help sign in
Adjust text for desktop right edge tutorial to be accurate. Fixes: #1563103

Approved by: Daniel d'Andrada

commite77be777410625a54242141216c74daf08a21d46 authorMichael Terry <michael.terry@canonical.com> dateWed 30 Mar 2016, 07:46 (11 years ago) parent679180f4abe6ce
3 files changed+21−1
compare with xenial
unifiedsplit
qml/Stages/DesktopStage.qml+3 qml/Tutorial/TutorialRight.qml+2−1 tests/qmltests/Tutorial/tst_Tutorial.qml+16
qml/Stages/DesktopStage.qml+3
@@ -36,6 +36,9 @@ AbstractStage {
3636 }
3737 }
3838
39+ // Used by TutorialRight
40+ property bool spreadShown: spread.state == "altTab"
41+
3942 mainApp: ApplicationManager.focusedApplicationId
4043 ? ApplicationManager.findApplication(ApplicationManager.focusedApplicationId)
4144 : null
qml/Tutorial/TutorialRight.qml+2−1
@@ -47,11 +47,12 @@ TutorialPage {
4747 anchors.right: root.right
4848 anchors.rightMargin: units.gu(2)
4949 anchors.verticalCenter: root.verticalCenter
50+ rotation: usageScenario === "desktop" ? 180 : 0
5051 }
5152
5253 label {
5354 text: root.usageScenario === "desktop" ?
54− i18n.tr("Hover your mouse on the right edge to view your open apps") :
55+ i18n.tr("Push your mouse against the right edge to view your open apps") :
5556 i18n.tr("Short or long swipe from the right edge to view your open apps")
5657 anchors.right: arrow.left
5758 anchors.rightMargin: units.gu(2) - (label.width - label.contentWidth)
tests/qmltests/Tutorial/tst_Tutorial.qml+16
@@ -764,6 +764,22 @@ Rectangle {
764764 tryCompare(tutorialRightLoader, "shown", true);
765765 }
766766
767+ function test_desktopTutorialRightFinish() {
768+ loadShell("desktop");
769+
770+ var tutorialRight = findChild(shell, "tutorialRight");
771+ ApplicationManager.startApplication("dialer-app");
772+ ApplicationManager.startApplication("camera-app");
773+ tryCompare(tutorialRight, "shown", true);
774+
775+ var stage = findChild(shell, "stage");
776+ mouseMove(shell, shell.width, shell.height / 2);
777+ stage.pushRightEdge(units.gu(8));
778+ tryCompare(tutorialRight, "shown", false);
779+
780+ tryCompare(AccountsService, "demoEdges", false);
781+ }
782+
767783 function test_oskDoesNotHideTutorial() {
768784 var tutorialLeft = findChild(shell, "tutorialLeft");
769785 verify(tutorialLeft.shown);