diff options
author | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2015-08-07 10:48:26 +0200 |
---|---|---|
committer | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2015-08-07 10:30:59 +0000 |
commit | 1c911f1a7e8bab144a844f868dac280533dad3f1 (patch) | |
tree | 5464c19dc306dd5b784657ec475c8ccdd8f11f08 | |
parent | 74bc515a67e2ae66323fd735dec198c66187ba17 (diff) |
Slider: add animated GIF to documentation.
Also adds the manual test that allows the GIF to be regenerated.
Change-Id: I90ddb770281a53d3ef342d7c6080664b74fe3b25
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
-rw-r--r-- | src/controls/doc/images/qtquickcontrols2-slider.gif | bin | 0 -> 9044 bytes | |||
-rw-r--r-- | src/controls/qquickslider.cpp | 2 | ||||
-rw-r--r-- | tests/manual/gifs/data/qtquickcontrols2-slider.qml | 52 | ||||
-rw-r--r-- | tests/manual/gifs/tst_gifs.cpp | 121 |
4 files changed, 175 insertions, 0 deletions
diff --git a/src/controls/doc/images/qtquickcontrols2-slider.gif b/src/controls/doc/images/qtquickcontrols2-slider.gif Binary files differnew file mode 100644 index 00000000..d9c98811 --- /dev/null +++ b/src/controls/doc/images/qtquickcontrols2-slider.gif diff --git a/src/controls/qquickslider.cpp b/src/controls/qquickslider.cpp index a93e0607..a17da03d 100644 --- a/src/controls/qquickslider.cpp +++ b/src/controls/qquickslider.cpp @@ -49,6 +49,8 @@ QT_BEGIN_NAMESPACE \ingroup sliders \brief A slider control. + \image qtquickcontrols2-slider.gif + Slider is used to select a value by sliding a handle along a track. \table diff --git a/tests/manual/gifs/data/qtquickcontrols2-slider.qml b/tests/manual/gifs/data/qtquickcontrols2-slider.qml new file mode 100644 index 00000000..0a26df86 --- /dev/null +++ b/tests/manual/gifs/data/qtquickcontrols2-slider.qml @@ -0,0 +1,52 @@ +/**************************************************************************** +** +** Copyright (C) 2015 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 + +Item { + width: slider.implicitWidth + height: slider.implicitHeight + + Slider { + id: slider + anchors.centerIn: parent + } +} diff --git a/tests/manual/gifs/tst_gifs.cpp b/tests/manual/gifs/tst_gifs.cpp index d2ff8d50..babf143a 100644 --- a/tests/manual/gifs/tst_gifs.cpp +++ b/tests/manual/gifs/tst_gifs.cpp @@ -50,6 +50,7 @@ private slots: void initTestCase(); void tumblerWrap(); + void slider(); private: QQuickView view; @@ -143,6 +144,126 @@ void tst_Gifs::tumblerWrap() } +void tst_Gifs::slider() +{ + GifRecorder gifRecorder; + gifRecorder.setDataDirPath(dataDirPath); + gifRecorder.setOutputDir(outputDir); + gifRecorder.setRecordingDuration(3); + gifRecorder.setQmlFileName("qtquickcontrols2-slider.qml"); + // TODO: default to replacing .qml with .gif if outputFileName is empty. + gifRecorder.setOutputFileName("qtquickcontrols2-slider.gif"); + gifRecorder.setView(&view); + + view.show(); + + gifRecorder.start(); + + QTest::mousePress(&view, Qt::LeftButton, Qt::NoModifier, QPoint(18, 19), 122); + QTest::mouseMove(&view, QPoint(20, 19), 154); + QTest::mouseMove(&view, QPoint(22, 19), 10); + QTest::mouseMove(&view, QPoint(24, 20), 10); + QTest::mouseMove(&view, QPoint(27, 20), 11); + QTest::mouseMove(&view, QPoint(31, 20), 10); + QTest::mouseMove(&view, QPoint(33, 20), 10); + QTest::mouseMove(&view, QPoint(36, 21), 11); + QTest::mouseMove(&view, QPoint(40, 22), 10); + QTest::mouseMove(&view, QPoint(43, 22), 10); + QTest::mouseMove(&view, QPoint(45, 22), 11); + QTest::mouseMove(&view, QPoint(50, 23), 16); + QTest::mouseMove(&view, QPoint(54, 23), 17); + QTest::mouseMove(&view, QPoint(60, 24), 16); + QTest::mouseMove(&view, QPoint(63, 24), 17); + QTest::mouseMove(&view, QPoint(65, 24), 0); + QTest::mouseMove(&view, QPoint(66, 24), 17); + QTest::mouseMove(&view, QPoint(68, 24), 0); + QTest::mouseMove(&view, QPoint(70, 24), 16); + QTest::mouseMove(&view, QPoint(71, 24), 1); + QTest::mouseMove(&view, QPoint(73, 24), 16); + QTest::mouseMove(&view, QPoint(74, 24), 0); + QTest::mouseMove(&view, QPoint(76, 24), 16); + QTest::mouseMove(&view, QPoint(77, 24), 0); + QTest::mouseMove(&view, QPoint(78, 24), 17); + QTest::mouseMove(&view, QPoint(80, 24), 0); + QTest::mouseMove(&view, QPoint(81, 24), 17); + QTest::mouseMove(&view, QPoint(82, 24), 0); + QTest::mouseMove(&view, QPoint(83, 24), 17); + QTest::mouseMove(&view, QPoint(84, 24), 16); + QTest::mouseMove(&view, QPoint(85, 24), 48); + QTest::mouseMove(&view, QPoint(85, 23), 10); + QTest::mouseMove(&view, QPoint(86, 23), 11); + QTest::mouseRelease(&view, Qt::LeftButton, Qt::NoModifier, QPoint(86, 23), 71); + QTest::mousePress(&view, Qt::LeftButton, Qt::NoModifier, QPoint(86, 22), 246); + QTest::mouseMove(&view, QPoint(87, 21), 123); + QTest::mouseMove(&view, QPoint(89, 21), 10); + QTest::mouseMove(&view, QPoint(91, 20), 10); + QTest::mouseMove(&view, QPoint(97, 20), 10); + QTest::mouseMove(&view, QPoint(101, 20), 11); + QTest::mouseMove(&view, QPoint(105, 20), 11); + QTest::mouseMove(&view, QPoint(113, 20), 10); + QTest::mouseMove(&view, QPoint(120, 20), 13); + QTest::mouseMove(&view, QPoint(129, 20), 17); + QTest::mouseMove(&view, QPoint(140, 20), 17); + QTest::mouseMove(&view, QPoint(150, 20), 16); + QTest::mouseMove(&view, QPoint(156, 20), 1); + QTest::mouseMove(&view, QPoint(161, 20), 16); + QTest::mouseMove(&view, QPoint(166, 20), 0); + QTest::mouseMove(&view, QPoint(172, 20), 17); + QTest::mouseMove(&view, QPoint(177, 20), 0); + QTest::mouseMove(&view, QPoint(181, 20), 16); + QTest::mouseMove(&view, QPoint(186, 20), 1); + QTest::mouseMove(&view, QPoint(191, 22), 16); + QTest::mouseMove(&view, QPoint(194, 22), 0); + QTest::mouseMove(&view, QPoint(197, 22), 17); + QTest::mouseMove(&view, QPoint(201, 22), 0); + QTest::mouseMove(&view, QPoint(204, 22), 17); + QTest::mouseMove(&view, QPoint(207, 22), 0); + QTest::mouseMove(&view, QPoint(211, 22), 16); + QTest::mouseMove(&view, QPoint(214, 22), 0); + QTest::mouseMove(&view, QPoint(216, 22), 10); + QTest::mouseMove(&view, QPoint(222, 22), 11); + QTest::mouseMove(&view, QPoint(226, 22), 10); + QTest::mouseMove(&view, QPoint(227, 22), 10); + QTest::mouseMove(&view, QPoint(229, 22), 10); + QTest::mouseMove(&view, QPoint(230, 22), 11); + QTest::mouseMove(&view, QPoint(232, 22), 10); + QTest::mouseMove(&view, QPoint(231, 22), 101); + QTest::mouseMove(&view, QPoint(230, 23), 10); + QTest::mouseMove(&view, QPoint(229, 23), 10); + QTest::mouseMove(&view, QPoint(225, 24), 10); + QTest::mouseMove(&view, QPoint(221, 24), 10); + QTest::mouseMove(&view, QPoint(218, 25), 10); + QTest::mouseMove(&view, QPoint(214, 25), 11); + QTest::mouseMove(&view, QPoint(201, 25), 10); + QTest::mouseMove(&view, QPoint(192, 25), 10); + QTest::mouseMove(&view, QPoint(183, 25), 11); + QTest::mouseMove(&view, QPoint(163, 25), 10); + QTest::mouseMove(&view, QPoint(154, 25), 11); + QTest::mouseMove(&view, QPoint(145, 23), 13); + QTest::mouseMove(&view, QPoint(136, 23), 1); + QTest::mouseMove(&view, QPoint(128, 21), 16); + QTest::mouseMove(&view, QPoint(120, 21), 0); + QTest::mouseMove(&view, QPoint(112, 20), 17); + QTest::mouseMove(&view, QPoint(110, 20), 0); + QTest::mouseMove(&view, QPoint(102, 20), 16); + QTest::mouseMove(&view, QPoint(94, 18), 0); + QTest::mouseMove(&view, QPoint(86, 18), 16); + QTest::mouseMove(&view, QPoint(78, 18), 0); + QTest::mouseMove(&view, QPoint(70, 18), 17); + QTest::mouseMove(&view, QPoint(62, 18), 0); + QTest::mouseMove(&view, QPoint(54, 18), 16); + QTest::mouseMove(&view, QPoint(47, 16), 0); + QTest::mouseMove(&view, QPoint(39, 16), 16); + QTest::mouseMove(&view, QPoint(31, 16), 0); + QTest::mouseMove(&view, QPoint(26, 16), 17); + QTest::mouseMove(&view, QPoint(20, 15), 0); + QTest::mouseMove(&view, QPoint(8, 15), 17); + QTest::mouseMove(&view, QPoint(0, 15), 16); + QTest::mouseRelease(&view, Qt::LeftButton, Qt::NoModifier, QPoint(0, 15), 215); + + gifRecorder.waitForFinish(); +} + QTEST_MAIN(tst_Gifs) #include "tst_gifs.moc" |