From e07d3691856d6975476fac2243c31b5d595bc723 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Fri, 22 Apr 2022 15:26:42 +0200 Subject: PDF example and manual test: add GridView for thumbnails Change the PdfDocument's id to doc, because in the GridView delegate, PdfPageImage { document: document } causes trouble (even though the same sort of binding was ok elsewhere). Change-Id: I9eafd818c25a31bef50b0b7fba36449c1dcf884a Reviewed-by: Richard Moe Gustavsen --- examples/pdf/multipage/viewer.qml | 74 ++++++++++++++++++++----- tests/manual/quick/pdf/gridview.qml | 105 ++++++++++++++++++++++++++++++++++++ 2 files changed, 166 insertions(+), 13 deletions(-) create mode 100644 tests/manual/quick/pdf/gridview.qml diff --git a/examples/pdf/multipage/viewer.qml b/examples/pdf/multipage/viewer.qml index 00788f926..c4561ef88 100644 --- a/examples/pdf/multipage/viewer.qml +++ b/examples/pdf/multipage/viewer.qml @@ -58,7 +58,7 @@ ApplicationWindow { width: 800 height: 1024 color: "lightgrey" - title: document.title + title: doc.title visible: true property string source // for main.cpp @@ -135,7 +135,7 @@ ApplicationWindow { SpinBox { id: currentPageSB from: 1 - to: document.pageCount + to: doc.pageCount editable: true onValueModified: view.goToPage(value - 1) Shortcut { @@ -187,7 +187,7 @@ ApplicationWindow { id: fileDialog title: "Open a PDF file" nameFilters: [ "PDF files (*.pdf)" ] - onAccepted: document.source = selectedFile + onAccepted: doc.source = selectedFile } Dialog { @@ -207,27 +207,27 @@ ApplicationWindow { onAccepted: passwordDialog.accept() } onOpened: passwordField.forceActiveFocus() - onAccepted: document.password = passwordField.text + onAccepted: doc.password = passwordField.text } Dialog { id: errorDialog - title: "Error loading " + document.source + title: "Error loading " + doc.source standardButtons: Dialog.Close modal: true closePolicy: Popup.CloseOnEscape anchors.centerIn: parent width: 300 - visible: document.status === PdfDocument.Error + visible: doc.status === PdfDocument.Error contentItem: Label { id: errorField - text: document.error + text: doc.error } } PdfDocument { - id: document + id: doc source: Qt.resolvedUrl(root.source) onPasswordRequired: passwordDialog.open() } @@ -236,7 +236,7 @@ ApplicationWindow { id: view anchors.fill: parent anchors.leftMargin: sidebar.position * sidebar.width - document: document + document: doc searchString: searchField.text onCurrentPageChanged: currentPageSB.value = view.currentPage + 1 } @@ -263,6 +263,9 @@ ApplicationWindow { TabButton { text: qsTr("Bookmarks") } + TabButton { + text: qsTr("Pages") + } } GroupBox { @@ -322,6 +325,7 @@ ApplicationWindow { TreeView { id: bookmarksTree implicitHeight: parent.height + implicitWidth: parent.width columnWidthProvider: function() { return width } delegate: TreeViewDelegate { required property int page @@ -330,10 +334,54 @@ ApplicationWindow { onClicked: view.goToLocation(page, location, zoom) } model: PdfBookmarkModel { - document: document + document: doc } ScrollBar.vertical: ScrollBar { } } + GridView { + id: thumbnailsView + implicitWidth: parent.width + implicitHeight: parent.height + model: doc.pageCount + cellWidth: width / 2 + cellHeight: cellWidth + 10 + delegate: Item { + required property int index + width: thumbnailsView.cellWidth + height: thumbnailsView.cellHeight + Rectangle { + id: paper + width: image.width + height: image.height + x: (parent.width - width) / 2 + y: (parent.height - height - pageNumber.height) / 2 + PdfPageImage { + id: image + document: doc + currentPage: index + asynchronous: true + fillMode: Image.PreserveAspectFit + property size naturalSize: doc.pagePointSize(index) + property bool landscape: naturalSize.width > naturalSize.height + width: landscape ? thumbnailsView.cellWidth - 6 + : height * naturalSize.width / naturalSize.height + height: landscape ? width * naturalSize.height / naturalSize.width + : thumbnailsView.cellHeight - 14 + sourceSize.width: width + sourceSize.height: height + } + } + Text { + id: pageNumber + anchors.bottom: parent.bottom + anchors.horizontalCenter: parent.horizontalCenter + text: "Page " + (image.currentFrame + 1) + } + TapHandler { + onTapped: view.goToPage(index) + } + } + } } } } @@ -389,11 +437,11 @@ ApplicationWindow { } Label { id: statusLabel - property size implicitPointSize: document.pagePointSize(view.currentPage) - text: "page " + (currentPageSB.value) + " of " + document.pageCount + + property size implicitPointSize: doc.pagePointSize(view.currentPage) + text: "page " + (currentPageSB.value) + " of " + doc.pageCount + " scale " + view.renderScale.toFixed(2) + " original " + implicitPointSize.width.toFixed(1) + "x" + implicitPointSize.height.toFixed(1) + " pt" - visible: document.pageCount > 0 + visible: doc.pageCount > 0 } } } diff --git a/tests/manual/quick/pdf/gridview.qml b/tests/manual/quick/pdf/gridview.qml new file mode 100644 index 000000000..9d995c272 --- /dev/null +++ b/tests/manual/quick/pdf/gridview.qml @@ -0,0 +1,105 @@ +/**************************************************************************** +** +** Copyright (C) 2022 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the manual tests of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, 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 +import QtQuick.Pdf + +Window { + width: 320 + height: 440 + color: "lightgrey" + title: doc.source + visible: true + + property real cellSize: 150 + + PdfDocument { + id: doc + source: "test.pdf" + } + + GridView { + id: view + anchors.fill: parent + anchors.margins: 10 + model: doc.pageCount + cellWidth: cellSize + cellHeight: cellSize + delegate: Item { + width: view.cellWidth + height: view.cellHeight + Rectangle { + id: paper + width: image.width + height: image.height + x: (parent.width - width) / 2 + y: (parent.height - height - pageNumber.height) / 2 + PdfPageImage { + id: image + document: doc + currentPage: index + asynchronous: true + fillMode: Image.PreserveAspectFit + property size naturalSize: doc.pagePointSize(index) + property bool landscape: naturalSize.width > naturalSize.height + width: landscape ? Math.min(view.cellWidth, naturalSize.width) : height * naturalSize.width / naturalSize.height + height: landscape ? width * naturalSize.height / naturalSize.width : Math.min(view.cellHeight - pageNumber.height, naturalSize.height) + sourceSize.width: width + sourceSize.height: height + } + } + Text { + id: pageNumber + anchors.bottom: parent.bottom + anchors.horizontalCenter: parent.horizontalCenter + text: "Page " + (image.currentFrame + 1) + } + } + } +} -- cgit v1.2.3