diff options
| author | Sylvain Pineau <sylvain.pineau@canonical.com> | 2018-04-30 14:41:47 +0200 |
|---|---|---|
| committer | Sylvain Pineau <sylvain.pineau@canonical.com> | 2018-04-30 14:41:47 +0200 |
| commit | 5fce85372efcf80660c035574f1d274799d4a533 (patch) | |
| tree | 7e297d69160868ff9cb9a6f57829f20fde729b2e | |
| parent | 0322afd467e93b33c42b0b4fc371a91bdf22517a (diff) | |
touchscreen/x-touch-tap: Fix qmlscene invocation and disable unity only on 16.04
Fixes: lp:1766766
| -rw-r--r-- | data/touch_tap_test.qml | 4 | ||||
| -rw-r--r-- | units/touchscreen/jobs.pxu | 14 |
2 files changed, 14 insertions, 4 deletions
diff --git a/data/touch_tap_test.qml b/data/touch_tap_test.qml index c56c930..fc2c61d 100644 --- a/data/touch_tap_test.qml +++ b/data/touch_tap_test.qml @@ -13,7 +13,7 @@ Rectangle { color: "white" font.pointSize: 15 property var timeout: 15 - text: "<p>Touch the screen with "+Qt.application.arguments[2]+" fingers at the same time</p>" + + text: "<p>Touch the screen with "+Qt.application.arguments[1]+" fingers at the same time</p>" + "<p>Press ESC to cancel the test at any time.</p>" + "<p><b>Test will exit automatically in " + timeout + " seconds </b></p>" @@ -72,7 +72,7 @@ Rectangle { enabled: true anchors.fill: parent - minimumTouchPoints: Qt.application.arguments[2] + minimumTouchPoints: Qt.application.arguments[1] maximumTouchPoints: minimumTouchPoints onReleased: { diff --git a/units/touchscreen/jobs.pxu b/units/touchscreen/jobs.pxu index 9db5677..98a2d4f 100644 --- a/units/touchscreen/jobs.pxu +++ b/units/touchscreen/jobs.pxu @@ -124,6 +124,7 @@ _description: Did the tap open the Dash? plugin: user-interact-verify +template-engine: jinja2 category_id: com.canonical.plainbox::touchscreen id: touchscreen/3-touch-tap imports: from com.canonical.plainbox import manifest @@ -139,14 +140,19 @@ _description: VERIFICATION: Did you see the green circles around the three fingers? command: + {%- if __system_env__["XDG_CURRENT_DESKTOP"] == 'Unity' %} manage_compiz_plugin unityshell disable - qmlscene -qt5 $PLAINBOX_PROVIDER_DATA/touch_tap_test.qml 3 2>&1 | grep -o PASS + {% endif %} + qmlscene -qt5 3 $PLAINBOX_PROVIDER_DATA/touch_tap_test.qml 2>&1 | grep -o PASS EXIT=$? sleep 5 + {%- if __system_env__["XDG_CURRENT_DESKTOP"] == 'Unity' %} manage_compiz_plugin unityshell enable + {% endif %} exit $EXIT plugin: user-interact-verify +template-engine: jinja2 category_id: com.canonical.plainbox::touchscreen id: touchscreen/4-touch-tap imports: from com.canonical.plainbox import manifest @@ -162,9 +168,13 @@ _description: VERIFICATION: Did you see the green circles around the four fingers? command: + {%- if __system_env__["XDG_CURRENT_DESKTOP"] == 'Unity' %} manage_compiz_plugin unityshell disable - qmlscene -qt5 $PLAINBOX_PROVIDER_DATA/touch_tap_test.qml 4 2>&1 | grep -o PASS + {% endif %} + qmlscene -qt5 4 $PLAINBOX_PROVIDER_DATA/touch_tap_test.qml 2>&1 | grep -o PASS EXIT=$? sleep 5 + {%- if __system_env__["XDG_CURRENT_DESKTOP"] == 'Unity' %} manage_compiz_plugin unityshell enable + {% endif %} exit $EXIT |