Improve CheckBox GIF and add RadioButton GIF

- Make the presses a bit more obvious.
- Remove unused QML/PNG files.

Change-Id: Id5e64c737d4c2c72aeca953f8e876c287f5e426d
Task-number: QTBUG-55904
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>

3 files changed, 105 insertions, 21 deletions

diff --git a/tests/manual/gifs/data/qtquickcontrols2-checkbox.qml b/tests/manual/gifs/data/qtquickcontrols2-checkbox.qml
index ef53721d..3195c1c9 100644
--- a/tests/manual/gifs/data/qtquickcontrols2-checkbox.qml
+++ b/tests/manual/gifs/data/qtquickcontrols2-checkbox.qml
@@ -48,8 +48,8 @@ Window {
     height: column.implicitHeight
     visible: true
 
-    property alias second: second
-    property alias third: third
+    property alias control2: control2
+    property alias control3: control3
 
     ColumnLayout {
         id: column
@@ -60,11 +60,11 @@ Window {
             text: qsTr("First")
         }
         CheckBox {
-            id: second
+            id: control2
             text: qsTr("Second")
         }
         CheckBox {
-            id: third
+            id: control3
             checked: true
             text: qsTr("Third")
         }
diff --git a/tests/manual/gifs/data/qtquickcontrols2-radiobutton.qml b/tests/manual/gifs/data/qtquickcontrols2-radiobutton.qml
new file mode 100644
index 00000000..576668f3
--- /dev/null
+++ b/tests/manual/gifs/data/qtquickcontrols2-radiobutton.qml
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.6
+import QtQuick.Controls 2.0
+import QtQuick.Layouts 1.1
+import QtQuick.Window 2.0
+
+Window {
+    width: column.implicitWidth
+    height: column.implicitHeight
+    visible: true
+
+    property alias control1: control1
+    property alias control2: control2
+    property alias control3: control3
+
+    ColumnLayout {
+        id: column
+        anchors.centerIn: parent
+
+        RadioButton {
+            id: control1
+            text: qsTr("First")
+            checked: true
+        }
+        RadioButton {
+            id: control2
+            text: qsTr("Second")
+        }
+        RadioButton {
+            id: control3
+            text: qsTr("Third")
+        }
+    }
+}
diff --git a/tests/manual/gifs/tst_gifs.cpp b/tests/manual/gifs/tst_gifs.cpp
index 8da12347..a54dd961 100644
--- a/tests/manual/gifs/tst_gifs.cpp
+++ b/tests/manual/gifs/tst_gifs.cpp
@@ -65,12 +65,13 @@ private slots:
     void delegates();
     void dial_data();
     void dial();
-    void checkBox();
     void scrollBar();
     void progressBar_data();
     void progressBar();
     void triState_data();
     void triState();
+    void checkables_data();
+    void checkables();
 
 private:
     void moveSmoothly(QQuickWindow *window, const QPoint &from, const QPoint &to, int movements,
@@ -613,30 +614,40 @@ void tst_Gifs::dial()
     gifRecorder.waitForFinish();
 }
 
-void tst_Gifs::checkBox()
+void tst_Gifs::checkables_data()
 {
+    QTest::addColumn<QString>("name");
+    QTest::addColumn<QVector<int> >("pressIndices");
+
+    QTest::newRow("checkbox") << "checkbox" << (QVector<int>() << 1 << 2 << 2 << 1);
+    QTest::newRow("radiobutton") << "radiobutton" << (QVector<int>() << 1 << 2 << 1 << 0);
+}
+
+void tst_Gifs::checkables()
+{
+    QFETCH(QString, name);
+    QFETCH(QVector<int>, pressIndices);
+
     GifRecorder gifRecorder;
     gifRecorder.setDataDirPath(dataDirPath);
     gifRecorder.setOutputDir(outputDir);
-    gifRecorder.setRecordingDuration(5);
-    gifRecorder.setQmlFileName("qtquickcontrols2-checkbox.qml");
+    gifRecorder.setRecordingDuration(6);
+    gifRecorder.setQmlFileName(QString::fromLatin1("qtquickcontrols2-%1.qml").arg(name));
 
     gifRecorder.start();
 
     QQuickWindow *window = gifRecorder.window();
-    QQuickItem *second = window->property("second").value<QQuickItem*>();
-    QVERIFY(second);
-    QQuickItem *third = window->property("third").value<QQuickItem*>();
-    QVERIFY(third);
-
-    QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier,
-        second->mapToScene(QPointF(second->width() / 2, second->height() / 2)).toPoint(), 400);
-    QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier,
-        third->mapToScene(QPointF(third->width() / 2, third->height() / 2)).toPoint(), 800);
-    QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier,
-        third->mapToScene(QPointF(third->width() / 2, third->height() / 2)).toPoint(), 800);
-    QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier,
-        second->mapToScene(QPointF(second->width() / 2, second->height() / 2)).toPoint(), 800);
+
+    for (int i = 0; i < pressIndices.size(); ++i) {
+        const int pressIndex = pressIndices.at(i);
+        const char *controlId = qPrintable(QString::fromLatin1("control%1").arg(pressIndex + 1));
+        QQuickItem *control = window->property(controlId).value<QQuickItem*>();
+        QVERIFY(control);
+
+        const QPoint pos = control->mapToScene(QPointF(control->width() / 2, control->height() / 2)).toPoint();
+        QTest::mousePress(window, Qt::LeftButton, Qt::NoModifier, pos, 800);
+        QTest::mouseClick(window, Qt::LeftButton, Qt::NoModifier, pos, 300);
+    }
 
     gifRecorder.waitForFinish();
 }