From 2f66e9c239e7965ec982dc6fae81f23de1ee1368 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Wed, 28 Sep 2016 15:29:32 +0200 Subject: Add screenshots manual test for taking screenshots of snippets This can be used to take screenshots of items loaded from snippets, without the window frame being included as would be the case if using e.g. qmlscene. Change-Id: I376148a66a26be846c102e768ffade204cea448b Reviewed-by: J-P Nurmi --- .gitignore | 1 + tests/manual/manual.pro | 1 + tests/manual/screenshots/qtquickcontrols2.conf | 2 + tests/manual/screenshots/screenshots.cpp | 62 ++++++++++ tests/manual/screenshots/screenshots.pro | 13 ++ tests/manual/screenshots/screenshots.qml | 164 +++++++++++++++++++++++++ 6 files changed, 243 insertions(+) create mode 100644 tests/manual/screenshots/qtquickcontrols2.conf create mode 100644 tests/manual/screenshots/screenshots.cpp create mode 100644 tests/manual/screenshots/screenshots.pro create mode 100644 tests/manual/screenshots/screenshots.qml diff --git a/.gitignore b/.gitignore index 38c45a96..7955f60b 100644 --- a/.gitignore +++ b/.gitignore @@ -39,6 +39,7 @@ /tests/manual/gifs/tst_gifs /tests/manual/styles/styles /tests/manual/testbench/testbench +/tests/manual/screenshots/screenshots /tests/auto/snippets/screenshots/*.png /tests/manual/gifs/gifs/*.gif diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro index 9c843e7b..5c648cea 100644 --- a/tests/manual/manual.pro +++ b/tests/manual/manual.pro @@ -2,6 +2,7 @@ TEMPLATE = subdirs SUBDIRS += \ gifs \ fonts \ + screenshots \ styles \ testbench diff --git a/tests/manual/screenshots/qtquickcontrols2.conf b/tests/manual/screenshots/qtquickcontrols2.conf new file mode 100644 index 00000000..b6c7c87e --- /dev/null +++ b/tests/manual/screenshots/qtquickcontrols2.conf @@ -0,0 +1,2 @@ +[Controls] +Style=Material diff --git a/tests/manual/screenshots/screenshots.cpp b/tests/manual/screenshots/screenshots.cpp new file mode 100644 index 00000000..0c14ead3 --- /dev/null +++ b/tests/manual/screenshots/screenshots.cpp @@ -0,0 +1,62 @@ +/**************************************************************************** +** +** 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$ +** +****************************************************************************/ + +#include +#include +#include +#include +#include + +int main(int argc, char *argv[]) +{ + QGuiApplication app(argc, argv); + + QQmlApplicationEngine engine; + const QUrl snippetsDir = QUrl::fromLocalFile(SNIPPETS_DIR); + Q_ASSERT(snippetsDir.isValid() && QFileInfo(snippetsDir.toLocalFile()).exists()); + engine.rootContext()->setContextProperty("snippetsDir", snippetsDir); + engine.rootContext()->setContextProperty("screenshotsDir", QUrl::fromLocalFile(QDir::currentPath())); + engine.rootContext()->setContextProperty("screenshotsDirStr", QDir::currentPath()); + engine.load(QUrl("qrc:/screenshots.qml")); + if (engine.rootObjects().isEmpty()) + return -1; + + return app.exec(); +} diff --git a/tests/manual/screenshots/screenshots.pro b/tests/manual/screenshots/screenshots.pro new file mode 100644 index 00000000..5894888f --- /dev/null +++ b/tests/manual/screenshots/screenshots.pro @@ -0,0 +1,13 @@ +TEMPLATE = app +TARGET = screenshots +QT += quick widgets + +DEFINES += SNIPPETS_DIR=\\\"$$PWD/../../../src/imports/controls/doc/snippets\\\" +message($$DEFINES) + +SOURCES += \ + screenshots.cpp + +RESOURCES += \ + screenshots.qml \ + qtquickcontrols2.conf diff --git a/tests/manual/screenshots/screenshots.qml b/tests/manual/screenshots/screenshots.qml new file mode 100644 index 00000000..afe7368b --- /dev/null +++ b/tests/manual/screenshots/screenshots.qml @@ -0,0 +1,164 @@ +/**************************************************************************** +** +** 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.Layouts 1.3 +import QtQuick.Controls 2.0 +import Qt.labs.folderlistmodel 2.1 + +ApplicationWindow { + id: window + title: "Qt Quick Controls 2 - Screenshots" + visible: true + width: Math.max(600, loader.implicitWidth) + height: Math.max(600, loader.implicitHeight) + + property string currentFilePath + property string lastSavePath + + Shortcut { + sequence: "Ctrl+Q" + onActivated: Qt.quit() + } + + header: ToolBar { + RowLayout { + anchors.fill: parent + + ToolButton { + text: "Choose Snippet" + focusPolicy: Qt.NoFocus + onClicked: snippetDrawer.open() + } + } + } + + Drawer { + id: snippetDrawer + width: window.width / 2 + height: window.height + + ListView { + id: snippetsListView + anchors.fill: parent + model: FolderListModel { + folder: snippetsDir + nameFilters: ["*.qml"] + showDirs: false + } + delegate: ItemDelegate { + width: parent.width + text: fileName + focusPolicy: Qt.NoFocus + + readonly property string baseName: fileBaseName + + contentItem: Label { + text: parent.text + elide: Text.ElideLeft + } + onClicked: { + snippetsListView.currentIndex = index; + loader.source = "file:///" + filePath; + currentFilePath = filePath; + snippetDrawer.close(); + } + } + } + } + + Loader { + id: loader + anchors.centerIn: parent + } + + ToolTip { + id: saveResultToolTip + x: window.contentItem.width / 2 - width / 2 + y: window.contentItem.height - height - 20 + timeout: 3000 + } + + footer: ToolBar { + RowLayout { + anchors.fill: parent + + ToolButton { + text: "Open Output Folder" + focusPolicy: Qt.NoFocus + onClicked: Qt.openUrlExternally(screenshotsDir) + } + + ToolButton { + text: "Open Last Screenshot" + focusPolicy: Qt.NoFocus + enabled: lastSavePath.length > 0 + onClicked: Qt.openUrlExternally(lastSavePath) + } + + Item { + Layout.fillWidth: true + } + + ToolButton { + text: "Take Screenshot" + focusPolicy: Qt.NoFocus + enabled: loader.status === Loader.Ready + onClicked: { + if (!loader.item) + return; + + var grabSuccessful = loader.grabToImage(function(result) { + var savePath = screenshotsDirStr + "/" + snippetsListView.currentItem.baseName + ".png"; + if (result.saveToFile(savePath)) { + saveResultToolTip.text = "Successfully saved screenshot to output folder"; + lastSavePath = savePath; + } else { + saveResultToolTip.text = "Failed to save screenshot"; + } + }) + if (!grabSuccessful) + saveResultToolTip.text = "Failed to grab image"; + saveResultToolTip.open(); + } + } + } + } +} -- cgit v1.2.3