Import plainbox-provider-checkbox_0.43.0.orig.tar.gzupstream-0.43.0patched-0.43.0-1

6 files changed, 47 insertions, 61 deletions

diff --git a/data/palm_rejection.qml b/data/palm_rejection.qml
index 1c9b974..3f93f2a 100644
--- a/data/palm_rejection.qml
+++ b/data/palm_rejection.qml
@@ -1,7 +1,7 @@
 /*
 * This file is part of Checkbox.
 *
- * Copyright 2016 Canonical Ltd.
+ * Copyright 2018 Canonical Ltd.
 * Written by:
 * Maciej Kisielewski <maciej.kisielewski@canonical.com>
 *
@@ -17,10 +17,10 @@
 * You should have received a copy of the GNU General Public License
 * along with Checkbox. If not, see <http://www.gnu.org/licenses/>.
 */
-import Ubuntu.Components 1.2
-import QtQuick 2.0
-import QtQuick.Layouts 1.1
-import Plainbox 0.1
+import QtQuick 2.5
+import QtQuick.Layouts 1.2
+import QtQuick.Controls 1.4
+import Plainbox 1.0
 
 QmlJob {
 property var steps: [
@@ -38,8 +38,8 @@ QmlJob {
 
 ColumnLayout {
 anchors.fill: parent
- anchors.margins: units.gu(1)
- spacing: units.gu(1)
+ anchors.margins: 10
+ spacing: 30
 Image {
 source: steps[currentStep][0]
 fillMode: Image.PreserveAspectFit
@@ -47,34 +47,30 @@ QmlJob {
 Layout.fillWidth: true
 }
 Label {
- text: i18n.tr("The cursor <b>SHOULD NOT</b> move with the palm movement?")
- fontSize: 'large'
+ text: "The cursor <b>SHOULD NOT</b> move with the palm movement?"
 horizontalAlignment: Text.AlignHCenter
 verticalAlignment: Text.AlignVCenter
- Layout.minimumHeight: units.gu(10)
+ Layout.minimumHeight: 30
 Layout.fillHeight: true
 Layout.fillWidth: true
 }
 RowLayout {
- Layout.minimumHeight: units.gu(10)
+ Layout.minimumHeight: 10
 Layout.fillWidth: true
 Button {
- text: i18n.tr('Pass')
- color: UbuntuColors.green
+ text: 'Pass'
 Layout.fillHeight: true
 Layout.fillWidth: true
 onClicked: testDone({'outcome': 'pass'})
 }
 Button {
- text: i18n.tr('Skip')
- color: "#FF9900"
+ text: 'Skip'
 Layout.fillHeight: true
 Layout.fillWidth: true
 onClicked: testDone({'outcome': 'skip'})
 }
 Button {
- text: i18n.tr('Fail')
- color: UbuntuColors.red
+ text: 'Fail'
 Layout.fillHeight: true
 Layout.fillWidth: true
 onClicked: testDone({'outcome': 'fail'})
diff --git a/data/resolution_test.qml b/data/resolution_test.qml
index cb4b0b5..50f75e7 100644
--- a/data/resolution_test.qml
+++ b/data/resolution_test.qml
@@ -19,20 +19,26 @@
 * along with Checkbox. If not, see <http://www.gnu.org/licenses/>.
 */
 
-import QtQuick 2.0
-import QtQuick.Window 2.0
+import QtQuick 2.5
+import QtQuick.Window 2.2
 
-Rectangle {
- border.color: "lime"
- border.width: 15
+Window {
 color: "transparent"
- Text {
- anchors.centerIn: parent
- text: Screen.width + " x " + Screen.height
- font.bold: true
- font.pointSize: 80
- color: "lime"
- smooth: true
+ visible: true
+ visibility: Window.FullScreen
+ Rectangle {
+ border.color: "lime"
+ border.width: 15
+ color: "transparent"
+ anchors.fill: parent
+ Text {
+ anchors.centerIn: parent
+ text: Screen.width + " x " + Screen.height
+ font.bold: true
+ font.pointSize: 80
+ color: "lime"
+ smooth: true
+ }
 }
 Timer {
 interval: 5000
@@ -40,4 +46,3 @@ Rectangle {
 onTriggered: Qt.quit()
 }
 }
-
diff --git a/data/touch_continuous_move_test.qml b/data/touch_continuous_move_test.qml
index 1913719..a234169 100644
--- a/data/touch_continuous_move_test.qml
+++ b/data/touch_continuous_move_test.qml
@@ -17,8 +17,7 @@
 along with Checkbox. If not, see <http://www.gnu.org/licenses/>.
 */
 
-import QtQuick 2.0
-import Ubuntu.Components 0.1
+import QtQuick 2.5
 
 Rectangle {
 width: 500
@@ -36,14 +35,14 @@ Rectangle {
 }
 
 Column {
- spacing: units.gu(5)
+ spacing: 10
 anchors.centerIn: parent
 Text {
 id: legend
 anchors.horizontalCenter: parent.horizontalCenter
 text: "Continuously move your mouse cursor"
 font.bold: true
- font.pointSize: 30
+ font.pointSize: 12
 }
 Text {
 id: countdown
diff --git a/data/touch_rotate_test.qml b/data/touch_rotate_test.qml
index a3b297f..8bdfe79 100644
--- a/data/touch_rotate_test.qml
+++ b/data/touch_rotate_test.qml
@@ -17,7 +17,6 @@
 along with Checkbox. If not, see <http://www.gnu.org/licenses/>.
 */
 import QtQuick 2.0
-import Ubuntu.Components 0.1
 
 Rectangle{
 id: mainWindow
@@ -66,7 +65,7 @@ Rectangle{
 id: instructions
 z: 1 // So it appears on top
 height: mainWindow.height / 3
- anchors.margins: units.gu(1.5)
+ anchors.margins: 10
 anchors.top: mainWindow.top
 anchors.left: mainWindow.left
 anchors.right: mainWindow.right
@@ -75,8 +74,8 @@ Rectangle{
 Text {
 id: text
 anchors.fill: instructions
- anchors.margins: units.gu(1.5)
- font.pointSize: units.gu(1.5)
+ anchors.margins: 5
+ font.pointSize: 12
 property var timeout: 30
 text: "Using two fingers, rotate the blue rectangle so it fits within the red outline. " +
 "Press ESC to cancel the test at any time. <b>Test will exit automatically in " +
@@ -103,11 +102,11 @@ Rectangle{
 Rectangle{
 id: goalsize
 anchors.top: instructions.bottom
- anchors.margins: units.gu(8)
+ anchors.margins: 8
 anchors.right: mainWindow.right
 anchors.left: mainWindow.left
 anchors.bottom: mainWindow.bottom
- anchors.bottomMargin: units.gu(10)
+ anchors.bottomMargin: 10
 border.color: "red"
 border.width: 4
 }
diff --git a/data/touch_tap_test.qml b/data/touch_tap_test.qml
index eff8a1a..c56c930 100644
--- a/data/touch_tap_test.qml
+++ b/data/touch_tap_test.qml
@@ -1,4 +1,3 @@
-import Ubuntu.Components 0.1
 import QtQuick 2.0
 
 Rectangle {
@@ -9,23 +8,12 @@ Rectangle {
 focus:true
 Keys.onEscapePressed: {Qt.quit()}
 
- Arguments {
- id: args
-
- Argument {
- name: "touchpoints"
- help: "minimum TouchPoints"
- required: true
- valueNames: ["TouchPoints"]
- }
- }
-
 Text {
 id: text
 color: "white"
- font.pointSize: units.gu(1.5)
+ font.pointSize: 15
 property var timeout: 15
- text: "<p>Touch the screen with "+args.values.touchpoints+" fingers at the same time</p>" +
+ text: "<p>Touch the screen with "+Qt.application.arguments[2]+" 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>"
@@ -84,7 +72,7 @@ Rectangle {
 enabled: true
 anchors.fill: parent
 
- minimumTouchPoints: args.values.touchpoints
+ minimumTouchPoints: Qt.application.arguments[2]
 maximumTouchPoints: minimumTouchPoints
 
 onReleased: {
diff --git a/data/touch_zoom_test.qml b/data/touch_zoom_test.qml
index 7976ea8..99eed21 100644
--- a/data/touch_zoom_test.qml
+++ b/data/touch_zoom_test.qml
@@ -17,7 +17,6 @@
 along with Checkbox. If not, see <http://www.gnu.org/licenses/>.
 */
 import QtQuick 2.0
-import Ubuntu.Components 0.1
 
 Rectangle{
 id: mainWindow
@@ -53,7 +52,7 @@ Rectangle{
 Rectangle{
 id: instructions
 height: mainWindow.height / 3
- anchors.margins: units.gu(1.5)
+ anchors.margins: 5
 anchors.top: mainWindow.top
 anchors.left: mainWindow.left
 anchors.right: mainWindow.right
@@ -62,8 +61,8 @@ Rectangle{
 Text {
 id: text
 anchors.fill: instructions
- anchors.margins: units.gu(1.5)
- font.pointSize: units.gu(1.5)
+ anchors.margins: 5
+ font.pointSize: 12
 property var timeout: 30
 text: "Using two fingers, scale the blue rectangle so it is larger than the red outline. " +
 "Press ESC to cancel the test at any time. <b>Test will exit automatically in " +
@@ -91,8 +90,8 @@ Rectangle{
 id: goalsize
 anchors.top: instructions.bottom
 anchors.bottom: mainWindow.bottom
- anchors.bottomMargin: units.gu(5)
- anchors.margins: units.gu(8)
+ anchors.bottomMargin: 5
+ anchors.margins: 8
 anchors.right: mainWindow.right
 anchors.left: mainWindow.left
 border.color: "red"