diff options
Diffstat (limited to 'examples/pdf')
| -rw-r--r-- | examples/pdf/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | examples/pdf/multipage/CMakeLists.txt | 75 | ||||
| -rw-r--r-- | examples/pdf/multipage/doc/src/multipage.qdoc | 59 | ||||
| -rw-r--r-- | examples/pdf/multipage/main.cpp | 68 | ||||
| -rw-r--r-- | examples/pdf/multipage/multipage.pro | 4 | ||||
| -rw-r--r-- | examples/pdf/multipage/pdfapplication.cpp | 16 | ||||
| -rw-r--r-- | examples/pdf/multipage/pdfapplication.h | 24 | ||||
| -rw-r--r-- | examples/pdf/multipage/resources/macos/Info.plist | 29 | ||||
| -rw-r--r-- | examples/pdf/multipage/resources/multipage.icns | bin | 0 -> 117648 bytes | |||
| -rw-r--r-- | examples/pdf/multipage/resources/sidebar-collapse-left.svg | 13 | ||||
| -rw-r--r-- | examples/pdf/multipage/resources/sidebar-expand-left.svg | 13 | ||||
| -rw-r--r-- | examples/pdf/multipage/resources/test.pdf | bin | 80045 -> 76633 bytes | |||
| -rw-r--r-- | examples/pdf/multipage/viewer.qml | 370 | ||||
| -rw-r--r-- | examples/pdf/multipage/viewer.qrc | 4 | ||||
| -rw-r--r-- | examples/pdf/pdf.pro | 2 | ||||
| -rw-r--r-- | examples/pdf/pdfviewer/main.cpp | 72 | ||||
| -rw-r--r-- | examples/pdf/singlepage/CMakeLists.txt | 62 | ||||
| -rw-r--r-- | examples/pdf/singlepage/doc/src/singlepage.qdoc | 62 | ||||
| -rw-r--r-- | examples/pdf/singlepage/main.cpp | 37 | ||||
| -rw-r--r-- | examples/pdf/singlepage/resources/document-open.svg (renamed from examples/pdf/pdfviewer/resources/document-open.svg) | 0 | ||||
| -rw-r--r-- | examples/pdf/singlepage/resources/edit-clear.svg (renamed from examples/pdf/pdfviewer/resources/edit-clear.svg) | 0 | ||||
| -rw-r--r-- | examples/pdf/singlepage/resources/edit-copy.svg (renamed from examples/pdf/pdfviewer/resources/edit-copy.svg) | 0 | ||||
| -rw-r--r-- | examples/pdf/singlepage/resources/edit-select-all.svg (renamed from examples/pdf/pdfviewer/resources/edit-select-all.svg) | 0 | ||||
| -rw-r--r-- | examples/pdf/singlepage/resources/go-down-search.svg (renamed from examples/pdf/pdfviewer/resources/go-down-search.svg) | 0 | ||||
| -rw-r--r-- | examples/pdf/singlepage/resources/go-next-view-page.svg (renamed from examples/pdf/pdfviewer/resources/go-next-view-page.svg) | 0 | ||||
| -rw-r--r-- | examples/pdf/singlepage/resources/go-previous-view-page.svg (renamed from examples/pdf/pdfviewer/resources/go-previous-view-page.svg) | 0 | ||||
| -rw-r--r-- | examples/pdf/singlepage/resources/go-up-search.svg (renamed from examples/pdf/pdfviewer/resources/go-up-search.svg) | 0 | ||||
| -rw-r--r-- | examples/pdf/singlepage/resources/rotate-left.svg (renamed from examples/pdf/pdfviewer/resources/rotate-left.svg) | 0 | ||||
| -rw-r--r-- | examples/pdf/singlepage/resources/rotate-right.svg (renamed from examples/pdf/pdfviewer/resources/rotate-right.svg) | 0 | ||||
| -rw-r--r-- | examples/pdf/singlepage/resources/test.pdf (renamed from examples/pdf/pdfviewer/resources/test.pdf) | bin | 80045 -> 76633 bytes | |||
| -rw-r--r-- | examples/pdf/singlepage/resources/zoom-fit-best.svg (renamed from examples/pdf/pdfviewer/resources/zoom-fit-best.svg) | 0 | ||||
| -rw-r--r-- | examples/pdf/singlepage/resources/zoom-fit-width.svg (renamed from examples/pdf/pdfviewer/resources/zoom-fit-width.svg) | 0 | ||||
| -rw-r--r-- | examples/pdf/singlepage/resources/zoom-in.svg (renamed from examples/pdf/pdfviewer/resources/zoom-in.svg) | 0 | ||||
| -rw-r--r-- | examples/pdf/singlepage/resources/zoom-original.svg (renamed from examples/pdf/pdfviewer/resources/zoom-original.svg) | 0 | ||||
| -rw-r--r-- | examples/pdf/singlepage/resources/zoom-out.svg (renamed from examples/pdf/pdfviewer/resources/zoom-out.svg) | 0 | ||||
| -rw-r--r-- | examples/pdf/singlepage/singlepage.pro (renamed from examples/pdf/pdfviewer/pdfviewer.pro) | 2 | ||||
| -rw-r--r-- | examples/pdf/singlepage/viewer.qml (renamed from examples/pdf/pdfviewer/viewer.qml) | 153 | ||||
| -rw-r--r-- | examples/pdf/singlepage/viewer.qrc (renamed from examples/pdf/pdfviewer/viewer.qrc) | 2 |
38 files changed, 716 insertions, 359 deletions
diff --git a/examples/pdf/CMakeLists.txt b/examples/pdf/CMakeLists.txt new file mode 100644 index 000000000..bdc1d0f05 --- /dev/null +++ b/examples/pdf/CMakeLists.txt @@ -0,0 +1,8 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + +qt_internal_add_example(singlepage) +qt_internal_add_example(multipage) +if(NOT TARGET Qt::Svg) + message(WARNING "QtSvg is required as runtime dependency for qtpdfquick examples.") +endif() diff --git a/examples/pdf/multipage/CMakeLists.txt b/examples/pdf/multipage/CMakeLists.txt new file mode 100644 index 000000000..8f8111c82 --- /dev/null +++ b/examples/pdf/multipage/CMakeLists.txt @@ -0,0 +1,75 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + +cmake_minimum_required(VERSION 3.16) +project(multipage LANGUAGES CXX) + +set(CMAKE_AUTOMOC ON) + +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/pdf/multipage") + +find_package(Qt6 REQUIRED COMPONENTS Gui Qml) + +qt_add_executable(multipage + main.cpp + pdfapplication.h + pdfapplication.cpp +) + +if (APPLE AND NOT IOS) + set(MACOSX_BUNDLE_ICON_FILE multipage.icns) + set(app_icon_macos "${CMAKE_CURRENT_SOURCE_DIR}/resources/multipage.icns") + set_source_files_properties(${app_icon_macos} PROPERTIES + MACOSX_PACKAGE_LOCATION "Resources") + target_sources(multipage PRIVATE ${app_icon_macos}) + set(MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/resources/macos/Info.plist") +endif() + +set_target_properties(multipage PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) + +target_link_libraries(multipage PUBLIC + Qt::Gui + Qt::Qml +) + +set(viewer_resource_files + "resources/document-open.svg" + "resources/edit-clear.svg" + "resources/edit-copy.svg" + "resources/edit-select-all.svg" + "resources/go-down-search.svg" + "resources/go-next-view-page.svg" + "resources/go-previous-view-page.svg" + "resources/go-up-search.svg" + "resources/rotate-left.svg" + "resources/rotate-right.svg" + "resources/sidebar-collapse-left.svg" + "resources/sidebar-expand-left.svg" + "resources/test.pdf" + "resources/zoom-fit-best.svg" + "resources/zoom-fit-width.svg" + "resources/zoom-in.svg" + "resources/zoom-original.svg" + "resources/zoom-out.svg" + "viewer.qml" +) + +qt_add_resources(multipage "viewer" + PREFIX + "/multipage" + FILES + ${viewer_resource_files} +) + +install(TARGETS multipage + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/examples/pdf/multipage/doc/src/multipage.qdoc b/examples/pdf/multipage/doc/src/multipage.qdoc new file mode 100644 index 000000000..7ce4b4a8b --- /dev/null +++ b/examples/pdf/multipage/doc/src/multipage.qdoc @@ -0,0 +1,59 @@ +// Copyright (C) 2022 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only + +/*! + \example multipage + \meta installpath pdf + \ingroup qtpdf-examples + \examplecategory {User Interface Components} + + \title PDF Multipage Viewer Example + \brief A Qt Quick PDF viewer that allows scrolling through the pages. + + \image multipageviewer.png + + \e {PDF Multipage Viewer} demonstrates how to use the PdfMultiPageView + component to render PDF documents and search for text in them. + + \include examples-run.qdocinc + + \section1 Creating the Main Window + + Instantiate an \l ApplicationWindow, bind its title to the title of the + PDF document, and create a toolbar: + + \quotefromfile multipage/viewer.qml + \skipto ApplicationWindow + \printuntil rightMargin + + The toolbar has buttons for most of the common actions: + + \printuntil ZoomOut + + Declare a PdfDocument and bind the \c status property and + \c passwordRequired signal to inform the user when an error occurs or a + password is required: + + \skipto onAccepted + \skipto Dialog + \printto PdfMultiPageView + + Add the main component, PdfMultiPageView: + + \printto onCurrentPageChanged + \printto Drawer + + A \l Drawer holds a ListView to show search results from the + \l {PdfMultiPageView::searchModel}{searchModel}: + + \printto ToolBar + + Finally, add a second toolbar as a footer, to hold the search field, + search up/down buttons and some status information: + + \printuntil + + \section1 Files and Attributions + + \sa {PDF Single Page Viewer Example} +*/ diff --git a/examples/pdf/multipage/main.cpp b/examples/pdf/multipage/main.cpp index 446b2999b..b9c31c7f8 100644 --- a/examples/pdf/multipage/main.cpp +++ b/examples/pdf/multipage/main.cpp @@ -1,54 +1,8 @@ -/**************************************************************************** -** -** Copyright (C) 2020 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the examples 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$ -** -****************************************************************************/ +// Copyright (C) 2020 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -#include <QGuiApplication> +#include "pdfapplication.h" +#include <QDir> #include <QQmlApplicationEngine> int main(int argc, char* argv[]) @@ -56,18 +10,18 @@ int main(int argc, char* argv[]) QCoreApplication::setApplicationName("Qt Quick Multi-page PDF Viewer Example"); QCoreApplication::setOrganizationName("QtProject"); QCoreApplication::setApplicationVersion(QT_VERSION_STR); - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - QGuiApplication app(argc, argv); + PdfApplication app(argc, argv); QQmlApplicationEngine engine; - engine.load(QUrl(QStringLiteral("qrc:///pdfviewer/viewer.qml"))); + engine.load(QUrl(QStringLiteral("qrc:///multipage/viewer.qml"))); + app.setFileOpener(engine.rootObjects().constFirst()); if (app.arguments().count() > 1) { - QUrl toLoad = QUrl::fromUserInput(app.arguments().at(1)); - engine.rootObjects().first()->setProperty("source", toLoad); + // alternatively, use QUrl::fromLocalFile(): network loading is not supported yet + QUrl toLoad = QUrl::fromUserInput(app.arguments().at(1), QDir::currentPath(), QUrl::AssumeLocalFile); + engine.rootObjects().constFirst()->setProperty("source", toLoad); } else { - engine.rootObjects().first()->setProperty("source", QStringLiteral("resources/test.pdf")); + engine.rootObjects().constFirst()->setProperty("source", QStringLiteral("resources/test.pdf")); } - return app.exec(); } diff --git a/examples/pdf/multipage/multipage.pro b/examples/pdf/multipage/multipage.pro index bd08ba0de..c12651335 100644 --- a/examples/pdf/multipage/multipage.pro +++ b/examples/pdf/multipage/multipage.pro @@ -2,7 +2,7 @@ TEMPLATE = app QT += qml quick pdf svg -SOURCES += main.cpp +SOURCES += main.cpp pdfapplication.cpp RESOURCES += \ viewer.qrc @@ -12,3 +12,5 @@ EXAMPLE_FILES = \ target.path = $$[QT_INSTALL_EXAMPLES]/pdf/multipage INSTALLS += target +macos:QMAKE_INFO_PLIST = resources/macos/Info.plist +macos:ICON = resources/multipage.icns diff --git a/examples/pdf/multipage/pdfapplication.cpp b/examples/pdf/multipage/pdfapplication.cpp new file mode 100644 index 000000000..d8e7c6486 --- /dev/null +++ b/examples/pdf/multipage/pdfapplication.cpp @@ -0,0 +1,16 @@ +// Copyright (C) 2022 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + +#include "pdfapplication.h" +#include <QFileOpenEvent> + +PdfApplication::PdfApplication(int &argc, char **argv) + : QGuiApplication(argc, argv) { } + +bool PdfApplication::event(QEvent *e) { + if (e->type() == QEvent::FileOpen) { + QFileOpenEvent *foEvent = static_cast<QFileOpenEvent *>(e); + m_fileOpener->setProperty("source", foEvent->url()); + } + return QGuiApplication::event(e); +} diff --git a/examples/pdf/multipage/pdfapplication.h b/examples/pdf/multipage/pdfapplication.h new file mode 100644 index 000000000..06c998e1c --- /dev/null +++ b/examples/pdf/multipage/pdfapplication.h @@ -0,0 +1,24 @@ +// Copyright (C) 2022 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + +#ifndef PDFAPPLICATION_H +#define PDFAPPLICATION_H + +#include <QGuiApplication> +#include <QObject> + +class PdfApplication : public QGuiApplication +{ +public: + PdfApplication(int &argc, char **argv); + void setFileOpener(QObject *opener) { + m_fileOpener = opener; + } + +protected: + bool event(QEvent *e) override; + + QObject *m_fileOpener; +}; + +#endif // PDFAPPLICATION_H diff --git a/examples/pdf/multipage/resources/macos/Info.plist b/examples/pdf/multipage/resources/macos/Info.plist new file mode 100644 index 000000000..512becda0 --- /dev/null +++ b/examples/pdf/multipage/resources/macos/Info.plist @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd"> +<plist version="0.1"> +<dict> + <key>CFBundleIconFile</key> + <string>multipage</string> + <key>CFBundleIdentifier</key> + <string>org.qt-project.multipage</string> + <key>CFBundleDisplayName</key> + <string>Multi-page PDF Viewer</string> + <key>CFBundlePackageType</key> + <string>APPL</string> + <key>CFBundleExecutable</key> + <string>multipage</string> + <key>CFBundleDocumentTypes</key> + <array> + <dict> + <key>CFBundleTypeRole</key> + <string>Viewer</string> + <key>CFBundleTypeName</key> + <string>pdf</string> + <key>LSItemContentTypes</key> + <array> + <string>com.adobe.pdf</string> + </array> + </dict> + </array> +</dict> +</plist> diff --git a/examples/pdf/multipage/resources/multipage.icns b/examples/pdf/multipage/resources/multipage.icns Binary files differnew file mode 100644 index 000000000..2e3756903 --- /dev/null +++ b/examples/pdf/multipage/resources/multipage.icns diff --git a/examples/pdf/multipage/resources/sidebar-collapse-left.svg b/examples/pdf/multipage/resources/sidebar-collapse-left.svg new file mode 100644 index 000000000..06f84afb4 --- /dev/null +++ b/examples/pdf/multipage/resources/sidebar-collapse-left.svg @@ -0,0 +1,13 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24"> + <style type="text/css" id="current-color-scheme"> + .ColorScheme-Text { + color:#232629; + } + </style> + <g transform="translate(1,1)"> + <g class="ColorScheme-Text" fill="currentColor"> + <path d="m3 3v16h16v-16zm5 1h10v14h-10z" stroke-linecap="square" stroke-linejoin="round"/> + <path d="m14.646484 6.6464844-4.353515 4.3535156 4.353515 4.353516.707032-.707032-3.646485-3.646484 3.646485-3.6464844z"/> + </g> + </g> +</svg> diff --git a/examples/pdf/multipage/resources/sidebar-expand-left.svg b/examples/pdf/multipage/resources/sidebar-expand-left.svg new file mode 100644 index 000000000..83b35206e --- /dev/null +++ b/examples/pdf/multipage/resources/sidebar-expand-left.svg @@ -0,0 +1,13 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24"> + <style type="text/css" id="current-color-scheme"> + .ColorScheme-Text { + color:#232629; + } + </style> + <g transform="translate(1,1)"> + <g class="ColorScheme-Text" fill="currentColor"> + <path d="m3 3v16h16v-16zm5 1h10v14h-10z" stroke-linecap="square" stroke-linejoin="round"/> + <path d="m11.353516 6.6464844 4.353515 4.3535156-4.353515 4.353516-.707032-.707032 3.646485-3.646484-3.646485-3.6464844z"/> + </g> + </g> +</svg> diff --git a/examples/pdf/multipage/resources/test.pdf b/examples/pdf/multipage/resources/test.pdf Binary files differindex a9dc1bc29..0832dfbed 100644 --- a/examples/pdf/multipage/resources/test.pdf +++ b/examples/pdf/multipage/resources/test.pdf diff --git a/examples/pdf/multipage/viewer.qml b/examples/pdf/multipage/viewer.qml index f66c8d381..55ca2994a 100644 --- a/examples/pdf/multipage/viewer.qml +++ b/examples/pdf/multipage/viewer.qml @@ -1,67 +1,17 @@ -/**************************************************************************** -** -** Copyright (C) 2020 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the examples 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 QtQml 2.14 // workaround for QTBUG-82873 -import QtQuick 2.14 -import QtQuick.Controls 2.14 -import QtQuick.Layouts 1.14 -import QtQuick.Pdf 5.15 -import QtQuick.Shapes 1.14 -import QtQuick.Window 2.14 -import Qt.labs.platform 1.1 as Platform +// Copyright (C) 2022 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +import QtQuick +import QtQuick.Controls +import QtQuick.Dialogs +import QtQuick.Layouts +import QtQuick.Pdf ApplicationWindow { id: root width: 800 height: 1024 color: "lightgrey" - title: document.title + title: doc.title visible: true property string source // for main.cpp @@ -72,7 +22,7 @@ ApplicationWindow { ToolButton { action: Action { shortcut: StandardKey.Open - icon.source: "resources/document-open.svg" + icon.source: "qrc:/multipage/resources/document-open.svg" onTriggered: fileDialog.open() } } @@ -80,7 +30,7 @@ ApplicationWindow { action: Action { shortcut: StandardKey.ZoomIn enabled: view.renderScale < 10 - icon.source: "resources/zoom-in.svg" + icon.source: "qrc:/multipage/resources/zoom-in.svg" onTriggered: view.renderScale *= Math.sqrt(2) } } @@ -88,47 +38,47 @@ ApplicationWindow { action: Action { shortcut: StandardKey.ZoomOut enabled: view.renderScale > 0.1 - icon.source: "resources/zoom-out.svg" + icon.source: "qrc:/multipage/resources/zoom-out.svg" onTriggered: view.renderScale /= Math.sqrt(2) } } ToolButton { action: Action { - icon.source: "resources/zoom-fit-width.svg" + icon.source: "qrc:/multipage/resources/zoom-fit-width.svg" onTriggered: view.scaleToWidth(root.contentItem.width, root.contentItem.height) } } ToolButton { action: Action { - icon.source: "resources/zoom-fit-best.svg" + icon.source: "qrc:/multipage/resources/zoom-fit-best.svg" onTriggered: view.scaleToPage(root.contentItem.width, root.contentItem.height) } } ToolButton { action: Action { shortcut: "Ctrl+0" - icon.source: "resources/zoom-original.svg" + icon.source: "qrc:/multipage/resources/zoom-original.svg" onTriggered: view.resetScale() } } ToolButton { action: Action { shortcut: "Ctrl+L" - icon.source: "resources/rotate-left.svg" + icon.source: "qrc:/multipage/resources/rotate-left.svg" onTriggered: view.pageRotation -= 90 } } ToolButton { action: Action { shortcut: "Ctrl+R" - icon.source: "resources/rotate-right.svg" + icon.source: "qrc:/multipage/resources/rotate-right.svg" onTriggered: view.pageRotation += 90 } } ToolButton { action: Action { - icon.source: "resources/go-previous-view-page.svg" - enabled: view.backEnbled + icon.source: "qrc:/multipage/resources/go-previous-view-page.svg" + enabled: view.backEnabled onTriggered: view.back() } ToolTip.visible: enabled && hovered @@ -138,7 +88,7 @@ ApplicationWindow { SpinBox { id: currentPageSB from: 1 - to: document.pageCount + to: doc.pageCount editable: true onValueModified: view.goToPage(value - 1) Shortcut { @@ -152,7 +102,7 @@ ApplicationWindow { } ToolButton { action: Action { - icon.source: "resources/go-next-view-page.svg" + icon.source: "qrc:/multipage/resources/go-next-view-page.svg" enabled: view.forwardEnabled onTriggered: view.forward() } @@ -163,21 +113,24 @@ ApplicationWindow { ToolButton { action: Action { shortcut: StandardKey.SelectAll - icon.source: "resources/edit-select-all.svg" + icon.source: "qrc:/multipage/resources/edit-select-all.svg" onTriggered: view.selectAll() } } ToolButton { action: Action { shortcut: StandardKey.Copy - icon.source: "resources/edit-copy.svg" + icon.source: "qrc:/multipage/resources/edit-copy.svg" enabled: view.selectedText !== "" onTriggered: view.copySelectionToClipboard() } } Shortcut { sequence: StandardKey.Find - onActivated: searchField.forceActiveFocus() + onActivated: { + searchField.forceActiveFocus() + searchField.selectAll() + } } Shortcut { sequence: StandardKey.Quit @@ -186,11 +139,11 @@ ApplicationWindow { } } - Platform.FileDialog { + FileDialog { id: fileDialog title: "Open a PDF file" nameFilters: [ "PDF files (*.pdf)" ] - onAccepted: document.source = file + onAccepted: doc.source = selectedFile } Dialog { @@ -202,55 +155,63 @@ ApplicationWindow { anchors.centerIn: parent width: 300 - TextField { + contentItem: TextField { id: passwordField placeholderText: qsTr("Please provide the password") echoMode: TextInput.Password width: parent.width onAccepted: passwordDialog.accept() } - onAccepted: document.password = passwordField.text + onOpened: passwordField.forceActiveFocus() + onAccepted: doc.password = passwordField.text } Dialog { id: errorDialog - title: "Error loading " + document.source - standardButtons: Dialog.Ok + title: "Error loading " + doc.source + standardButtons: Dialog.Close modal: true closePolicy: Popup.CloseOnEscape anchors.centerIn: parent width: 300 + visible: doc.status === PdfDocument.Error - Label { + contentItem: Label { id: errorField - text: document.error + text: doc.error } } PdfDocument { - id: document + id: doc source: Qt.resolvedUrl(root.source) - onStatusChanged: { - if (status === PdfDocument.Error) errorDialog.open() - view.document = (status === PdfDocument.Ready ? document : undefined) - } - onPasswordRequired: { - passwordDialog.open() - passwordField.forceActiveFocus() - } + onPasswordRequired: passwordDialog.open() } PdfMultiPageView { id: view anchors.fill: parent - anchors.leftMargin: searchDrawer.position * searchDrawer.width - document: root.document + anchors.leftMargin: sidebar.position * sidebar.width + document: doc searchString: searchField.text onCurrentPageChanged: currentPageSB.value = view.currentPage + 1 } + DropArea { + anchors.fill: parent + keys: ["text/uri-list"] + onEntered: (drag) => { + drag.accepted = (drag.proposedAction === Qt.MoveAction || drag.proposedAction === Qt.CopyAction) && + drag.hasUrls && drag.urls[0].endsWith("pdf") + } + onDropped: (drop) => { + doc.source = drop.urls[0] + drop.acceptProposedAction() + } + } + Drawer { - id: searchDrawer + id: sidebar edge: Qt.LeftEdge modal: false width: 300 @@ -258,58 +219,189 @@ ApplicationWindow { height: view.height dim: false clip: true - ListView { - id: searchResultsList + + TabBar { + id: sidebarTabs + x: -width + rotation: -90 + transformOrigin: Item.TopRight + currentIndex: 2 // bookmarks by default + TabButton { + text: qsTr("Info") + } + TabButton { + text: qsTr("Search Results") + } + TabButton { + text: qsTr("Bookmarks") + } + TabButton { + text: qsTr("Pages") + } + } + + GroupBox { anchors.fill: parent - anchors.margins: 2 - model: view.searchModel - ScrollBar.vertical: ScrollBar { } - delegate: ItemDelegate { - width: parent ? parent.width : 0 - RowLayout { - anchors.fill: parent - spacing: 0 - Label { - text: "Page " + (page + 1) + ": " - } - Label { - text: contextBefore - elide: Text.ElideLeft - horizontalAlignment: Text.AlignRight - Layout.fillWidth: true - Layout.preferredWidth: parent.width / 2 + anchors.leftMargin: sidebarTabs.height + + StackLayout { + anchors.fill: parent + currentIndex: sidebarTabs.currentIndex + component InfoField: TextInput { + width: parent.width + selectByMouse: true + readOnly: true + wrapMode: Text.WordWrap + } + Column { + spacing: 6 + width: parent.width - 6 + Label { font.bold: true; text: qsTr("Title") } + InfoField { text: doc.title } + Label { font.bold: true; text: qsTr("Author") } + InfoField { text: doc.author } + Label { font.bold: true; text: qsTr("Subject") } + InfoField { text: doc.subject } + Label { font.bold: true; text: qsTr("Keywords") } + InfoField { text: doc.keywords } + Label { font.bold: true; text: qsTr("Producer") } + InfoField { text: doc.producer } + Label { font.bold: true; text: qsTr("Creator") } + InfoField { text: doc.creator } + Label { font.bold: true; text: qsTr("Creation date") } + InfoField { text: doc.creationDate } + Label { font.bold: true; text: qsTr("Modification date") } + InfoField { text: doc.modificationDate } + } + ListView { + id: searchResultsList + implicitHeight: parent.height + model: view.searchModel + currentIndex: view.searchModel.currentResult + ScrollBar.vertical: ScrollBar { } + delegate: ItemDelegate { + id: resultDelegate + required property int index + required property int page + required property string contextBefore + required property string contextAfter + width: parent ? parent.width : 0 + RowLayout { + anchors.fill: parent + spacing: 0 + Label { + text: "Page " + (resultDelegate.page + 1) + ": " + } + Label { + text: resultDelegate.contextBefore + elide: Text.ElideLeft + horizontalAlignment: Text.AlignRight + Layout.fillWidth: true + Layout.preferredWidth: parent.width / 2 + } + Label { + font.bold: true + text: view.searchString + width: implicitWidth + } + Label { + text: resultDelegate.contextAfter + elide: Text.ElideRight + Layout.fillWidth: true + Layout.preferredWidth: parent.width / 2 + } + } + highlighted: ListView.isCurrentItem + onClicked: view.searchModel.currentResult = resultDelegate.index } - Label { - font.bold: true - text: view.searchString - width: implicitWidth + } + TreeView { + id: bookmarksTree + implicitHeight: parent.height + implicitWidth: parent.width + columnWidthProvider: function() { return width } + delegate: TreeViewDelegate { + required property int page + required property point location + required property real zoom + onClicked: view.goToLocation(page, location, zoom) } - Label { - text: contextAfter - elide: Text.ElideRight - Layout.fillWidth: true - Layout.preferredWidth: parent.width / 2 + model: PdfBookmarkModel { + document: doc } + ScrollBar.vertical: ScrollBar { } } - highlighted: ListView.isCurrentItem - onClicked: { - searchResultsList.currentIndex = index - view.goToLocation(page, location, 0) - view.searchModel.currentResult = indexOnPage + GridView { + id: thumbnailsView + implicitWidth: parent.width + implicitHeight: parent.height + model: doc.pageModel + cellWidth: width / 2 + cellHeight: cellWidth + 10 + delegate: Item { + required property int index + required property string label + required property size pointSize + 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 + currentFrame: index + asynchronous: true + fillMode: Image.PreserveAspectFit + property bool landscape: pointSize.width > pointSize.height + width: landscape ? thumbnailsView.cellWidth - 6 + : height * pointSize.width / pointSize.height + height: landscape ? width * pointSize.height / pointSize.width + : thumbnailsView.cellHeight - 14 + sourceSize.width: width + sourceSize.height: height + } + } + Text { + id: pageNumber + anchors.bottom: parent.bottom + anchors.horizontalCenter: parent.horizontalCenter + text: label + } + TapHandler { + onTapped: view.goToPage(index) + } + } } } } } footer: ToolBar { - height: footerRow.implicitHeight + height: footerRow.implicitHeight + 6 RowLayout { id: footerRow anchors.fill: parent ToolButton { action: Action { - icon.source: "resources/go-up-search.svg" + id: sidebarOpenAction + checkable: true + checked: sidebar.opened + icon.source: checked ? "qrc:/multipage/resources/sidebar-collapse-left.svg" : "qrc:/multipage/resources/sidebar-expand-left.svg" + onTriggered: sidebar.open() + } + ToolTip.visible: enabled && hovered + ToolTip.delay: 2000 + ToolTip.text: "open sidebar" + } + ToolButton { + action: Action { + icon.source: "qrc:/multipage/resources/go-up-search.svg" shortcut: StandardKey.FindPrevious + enabled: view.searchModel.count > 0 onTriggered: view.searchBack() } ToolTip.visible: enabled && hovered @@ -321,16 +413,19 @@ ApplicationWindow { placeholderText: "search" Layout.minimumWidth: 150 Layout.fillWidth: true - onAccepted: searchDrawer.open() + Layout.bottomMargin: 3 + onAccepted: { + sidebar.open() + sidebarTabs.setCurrentIndex(1) + } Image { visible: searchField.text !== "" - source: "resources/edit-clear.svg" + source: "qrc:/multipage/resources/edit-clear.svg" + sourceSize.height: searchField.height - 6 anchors { right: parent.right - top: parent.top - bottom: parent.bottom + verticalCenter: parent.verticalCenter margins: 3 - rightMargin: 5 } TapHandler { onTapped: searchField.clear() @@ -339,8 +434,9 @@ ApplicationWindow { } ToolButton { action: Action { - icon.source: "resources/go-down-search.svg" + icon.source: "qrc:/multipage/resources/go-down-search.svg" shortcut: StandardKey.FindNext + enabled: view.searchModel.count > 0 onTriggered: view.searchForward() } ToolTip.visible: enabled && hovered @@ -349,11 +445,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/examples/pdf/multipage/viewer.qrc b/examples/pdf/multipage/viewer.qrc index ffca51679..e786ae4ce 100644 --- a/examples/pdf/multipage/viewer.qrc +++ b/examples/pdf/multipage/viewer.qrc @@ -1,5 +1,5 @@ <RCC> - <qresource prefix="/pdfviewer"> + <qresource prefix="/singlepage"> <file>viewer.qml</file> <file>resources/document-open.svg</file> <file>resources/edit-clear.svg</file> @@ -11,6 +11,8 @@ <file>resources/go-up-search.svg</file> <file>resources/rotate-left.svg</file> <file>resources/rotate-right.svg</file> + <file>resources/sidebar-collapse-left.svg</file> + <file>resources/sidebar-expand-left.svg</file> <file>resources/test.pdf</file> <file>resources/zoom-in.svg</file> <file>resources/zoom-fit-best.svg</file> diff --git a/examples/pdf/pdf.pro b/examples/pdf/pdf.pro index 0ae198ee7..96ead5948 100644 --- a/examples/pdf/pdf.pro +++ b/examples/pdf/pdf.pro @@ -1,3 +1,3 @@ TEMPLATE=subdirs -qtHaveModule(svg): SUBDIRS += pdfviewer multipage +qtHaveModule(svg): SUBDIRS += singlepage multipage diff --git a/examples/pdf/pdfviewer/main.cpp b/examples/pdf/pdfviewer/main.cpp deleted file mode 100644 index 13db2b88a..000000000 --- a/examples/pdf/pdfviewer/main.cpp +++ /dev/null @@ -1,72 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2020 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the examples 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$ -** -****************************************************************************/ - -#include <QGuiApplication> -#include <QQmlApplicationEngine> - -int main(int argc, char* argv[]) -{ - QCoreApplication::setApplicationName("Qt Quick PDF Viewer Example"); - QCoreApplication::setOrganizationName("QtProject"); - QCoreApplication::setApplicationVersion(QT_VERSION_STR); - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - QGuiApplication app(argc, argv); - - QQmlApplicationEngine engine; - engine.load(QUrl(QStringLiteral("qrc:///pdfviewer/viewer.qml"))); - if (app.arguments().count() > 1) { - QUrl toLoad = QUrl::fromUserInput(app.arguments().at(1)); - engine.rootObjects().first()->setProperty("source", toLoad); - } else { - engine.rootObjects().first()->setProperty("source", QStringLiteral("resources/test.pdf")); - } - - return app.exec(); -} diff --git a/examples/pdf/singlepage/CMakeLists.txt b/examples/pdf/singlepage/CMakeLists.txt new file mode 100644 index 000000000..fac95f54a --- /dev/null +++ b/examples/pdf/singlepage/CMakeLists.txt @@ -0,0 +1,62 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + +cmake_minimum_required(VERSION 3.16) +project(singlepage LANGUAGES CXX) + +set(CMAKE_AUTOMOC ON) + +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/pdf/singlepage") + +find_package(Qt6 REQUIRED COMPONENTS Gui Qml) + +qt_add_executable(pdfviewerquick + main.cpp +) + +set_target_properties(pdfviewerquick PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) + +target_link_libraries(pdfviewerquick PUBLIC + Qt::Gui + Qt::Qml +) + +set(viewer_resource_files + "resources/document-open.svg" + "resources/edit-clear.svg" + "resources/edit-copy.svg" + "resources/edit-select-all.svg" + "resources/go-down-search.svg" + "resources/go-next-view-page.svg" + "resources/go-previous-view-page.svg" + "resources/go-up-search.svg" + "resources/rotate-left.svg" + "resources/rotate-right.svg" + "resources/test.pdf" + "resources/zoom-fit-best.svg" + "resources/zoom-fit-width.svg" + "resources/zoom-in.svg" + "resources/zoom-original.svg" + "resources/zoom-out.svg" + "viewer.qml" +) + +qt_add_resources(pdfviewerquick "viewer" + PREFIX + "/singlepage" + FILES + ${viewer_resource_files} +) + +install(TARGETS pdfviewerquick + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/examples/pdf/singlepage/doc/src/singlepage.qdoc b/examples/pdf/singlepage/doc/src/singlepage.qdoc new file mode 100644 index 000000000..773f9acae --- /dev/null +++ b/examples/pdf/singlepage/doc/src/singlepage.qdoc @@ -0,0 +1,62 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only + +/*! + \example singlepage + \meta installpath pdf + \ingroup qtpdf-examples + \examplecategory {User Interface Components} + + \title PDF Single Page Viewer Example + \brief A Qt Quick PDF viewer that views one page at a time. + + \image singlepageviewer.webp + + \e {PDF Single Page Viewer Example} demonstrates how to use the PdfScrollablePageView + component to render PDF documents and search for text in them. + + \include examples-run.qdocinc + + \section1 Creating the Main Window + + Instantiate an \l ApplicationWindow, bind its title to the title of the + PDF document, and create a toolbar: + + \quotefromfile singlepage/viewer.qml + \skipto ApplicationWindow + \printuntil rightMargin + + The toolbar has buttons for most of the common actions, + plus a SpinBox to show and control the current page number: + + \printuntil ZoomOut + \dots + \skipto SpinBox + \printto onValueModified + \dots + + Add dialogs to inform the user when an error occurs and to prompt for a + password if required: + + \skipto onAccepted + \skipto Dialog + \printto PdfScrollablePageView + + Add the main component, PdfScrollablePageView: + + \printto Drawer { + + A \l Drawer holds a ListView to show search results from the + \l {PdfScrollablePageView::searchModel}{searchModel}: + + \printto ToolBar + + Finally, add a second toolbar as a footer, to hold the search field, + search up/down buttons and some status information: + + \printuntil + + \section1 Files and Attributions + + \sa {PDF Multipage Viewer Example} +*/ diff --git a/examples/pdf/singlepage/main.cpp b/examples/pdf/singlepage/main.cpp new file mode 100644 index 000000000..be5c8f73c --- /dev/null +++ b/examples/pdf/singlepage/main.cpp @@ -0,0 +1,37 @@ +// Copyright (C) 2020 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + +#include <QQmlApplicationEngine> + +#include <QGuiApplication> + +#include <QCommandLineParser> +#include <QCommandLineOption> + +int main(int argc, char* argv[]) +{ + QCoreApplication::setApplicationName("Qt Quick PDF Viewer Example"); + QCoreApplication::setOrganizationName("QtProject"); + QCoreApplication::setApplicationVersion(QT_VERSION_STR); + QGuiApplication app(argc, argv); + + QCommandLineParser parser; + parser.addHelpOption(); + parser.addVersionOption(); + parser.addPositionalArgument("file", "The file to open."); + parser.process(app); + + QQmlApplicationEngine engine; + + QUrl toLoad = QUrl("qrc:/singlepage/resources/test.pdf"); + if (!parser.positionalArguments().isEmpty()) + toLoad = QUrl::fromLocalFile(parser.positionalArguments().constFirst()); + + engine.setInitialProperties({{"source", toLoad}}); + + engine.load(QUrl(QStringLiteral("qrc:///singlepage/viewer.qml"))); + if (engine.rootObjects().isEmpty()) + return -1; + + return app.exec(); +} diff --git a/examples/pdf/pdfviewer/resources/document-open.svg b/examples/pdf/singlepage/resources/document-open.svg index bf23123a3..bf23123a3 100644 --- a/examples/pdf/pdfviewer/resources/document-open.svg +++ b/examples/pdf/singlepage/resources/document-open.svg diff --git a/examples/pdf/pdfviewer/resources/edit-clear.svg b/examples/pdf/singlepage/resources/edit-clear.svg index 1c35aaf04..1c35aaf04 100644 --- a/examples/pdf/pdfviewer/resources/edit-clear.svg +++ b/examples/pdf/singlepage/resources/edit-clear.svg diff --git a/examples/pdf/pdfviewer/resources/edit-copy.svg b/examples/pdf/singlepage/resources/edit-copy.svg index 9dd16877d..9dd16877d 100644 --- a/examples/pdf/pdfviewer/resources/edit-copy.svg +++ b/examples/pdf/singlepage/resources/edit-copy.svg diff --git a/examples/pdf/pdfviewer/resources/edit-select-all.svg b/examples/pdf/singlepage/resources/edit-select-all.svg index 5f21950a0..5f21950a0 100644 --- a/examples/pdf/pdfviewer/resources/edit-select-all.svg +++ b/examples/pdf/singlepage/resources/edit-select-all.svg diff --git a/examples/pdf/pdfviewer/resources/go-down-search.svg b/examples/pdf/singlepage/resources/go-down-search.svg index ae17ab93b..ae17ab93b 100644 --- a/examples/pdf/pdfviewer/resources/go-down-search.svg +++ b/examples/pdf/singlepage/resources/go-down-search.svg diff --git a/examples/pdf/pdfviewer/resources/go-next-view-page.svg b/examples/pdf/singlepage/resources/go-next-view-page.svg index e453ddbec..e453ddbec 100644 --- a/examples/pdf/pdfviewer/resources/go-next-view-page.svg +++ b/examples/pdf/singlepage/resources/go-next-view-page.svg diff --git a/examples/pdf/pdfviewer/resources/go-previous-view-page.svg b/examples/pdf/singlepage/resources/go-previous-view-page.svg index b032309e9..b032309e9 100644 --- a/examples/pdf/pdfviewer/resources/go-previous-view-page.svg +++ b/examples/pdf/singlepage/resources/go-previous-view-page.svg diff --git a/examples/pdf/pdfviewer/resources/go-up-search.svg b/examples/pdf/singlepage/resources/go-up-search.svg index 5cc155873..5cc155873 100644 --- a/examples/pdf/pdfviewer/resources/go-up-search.svg +++ b/examples/pdf/singlepage/resources/go-up-search.svg diff --git a/examples/pdf/pdfviewer/resources/rotate-left.svg b/examples/pdf/singlepage/resources/rotate-left.svg index 90ce53c9d..90ce53c9d 100644 --- a/examples/pdf/pdfviewer/resources/rotate-left.svg +++ b/examples/pdf/singlepage/resources/rotate-left.svg diff --git a/examples/pdf/pdfviewer/resources/rotate-right.svg b/examples/pdf/singlepage/resources/rotate-right.svg index 7383d1c84..7383d1c84 100644 --- a/examples/pdf/pdfviewer/resources/rotate-right.svg +++ b/examples/pdf/singlepage/resources/rotate-right.svg diff --git a/examples/pdf/pdfviewer/resources/test.pdf b/examples/pdf/singlepage/resources/test.pdf Binary files differindex a9dc1bc29..0832dfbed 100644 --- a/examples/pdf/pdfviewer/resources/test.pdf +++ b/examples/pdf/singlepage/resources/test.pdf diff --git a/examples/pdf/pdfviewer/resources/zoom-fit-best.svg b/examples/pdf/singlepage/resources/zoom-fit-best.svg index adf302621..adf302621 100644 --- a/examples/pdf/pdfviewer/resources/zoom-fit-best.svg +++ b/examples/pdf/singlepage/resources/zoom-fit-best.svg diff --git a/examples/pdf/pdfviewer/resources/zoom-fit-width.svg b/examples/pdf/singlepage/resources/zoom-fit-width.svg index 985ee5205..985ee5205 100644 --- a/examples/pdf/pdfviewer/resources/zoom-fit-width.svg +++ b/examples/pdf/singlepage/resources/zoom-fit-width.svg diff --git a/examples/pdf/pdfviewer/resources/zoom-in.svg b/examples/pdf/singlepage/resources/zoom-in.svg index efdc9f17d..efdc9f17d 100644 --- a/examples/pdf/pdfviewer/resources/zoom-in.svg +++ b/examples/pdf/singlepage/resources/zoom-in.svg diff --git a/examples/pdf/pdfviewer/resources/zoom-original.svg b/examples/pdf/singlepage/resources/zoom-original.svg index 1b4080a03..1b4080a03 100644 --- a/examples/pdf/pdfviewer/resources/zoom-original.svg +++ b/examples/pdf/singlepage/resources/zoom-original.svg diff --git a/examples/pdf/pdfviewer/resources/zoom-out.svg b/examples/pdf/singlepage/resources/zoom-out.svg index fcde9e526..fcde9e526 100644 --- a/examples/pdf/pdfviewer/resources/zoom-out.svg +++ b/examples/pdf/singlepage/resources/zoom-out.svg diff --git a/examples/pdf/pdfviewer/pdfviewer.pro b/examples/pdf/singlepage/singlepage.pro index a1c578efc..3b9f6399d 100644 --- a/examples/pdf/pdfviewer/pdfviewer.pro +++ b/examples/pdf/singlepage/singlepage.pro @@ -9,6 +9,6 @@ RESOURCES += \ EXAMPLE_FILES = \ viewer.qml -target.path = $$[QT_INSTALL_EXAMPLES]/pdf/pdfviewer +target.path = $$[QT_INSTALL_EXAMPLES]/pdf/singlepage INSTALLS += target diff --git a/examples/pdf/pdfviewer/viewer.qml b/examples/pdf/singlepage/viewer.qml index 38d62740a..9b6668a3a 100644 --- a/examples/pdf/pdfviewer/viewer.qml +++ b/examples/pdf/singlepage/viewer.qml @@ -1,61 +1,10 @@ -/**************************************************************************** -** -** Copyright (C) 2020 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the examples 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 QtQml 2.14 // workaround for QTBUG-82873 -import QtQuick 2.14 -import QtQuick.Controls 2.14 -import QtQuick.Layouts 1.14 -import QtQuick.Pdf 5.15 -import QtQuick.Shapes 1.14 -import QtQuick.Window 2.14 -import Qt.labs.animation 1.0 -import Qt.labs.platform 1.1 as Platform +// Copyright (C) 2022 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +import QtQuick +import QtQuick.Controls +import QtQuick.Dialogs +import QtQuick.Layouts +import QtQuick.Pdf ApplicationWindow { id: root @@ -64,7 +13,7 @@ ApplicationWindow { color: "lightgrey" title: document.title visible: true - property string source // for main.cpp + required property url source // for main.cpp property real scaleStep: Math.sqrt(2) header: ToolBar { @@ -74,7 +23,7 @@ ApplicationWindow { ToolButton { action: Action { shortcut: StandardKey.Open - icon.source: "resources/document-open.svg" + icon.source: "qrc:/singlepage/resources/document-open.svg" onTriggered: fileDialog.open() } } @@ -82,7 +31,7 @@ ApplicationWindow { action: Action { shortcut: StandardKey.ZoomIn enabled: view.sourceSize.width < 10000 - icon.source: "resources/zoom-in.svg" + icon.source: "qrc:/singlepage/resources/zoom-in.svg" onTriggered: view.renderScale *= root.scaleStep } } @@ -90,46 +39,46 @@ ApplicationWindow { action: Action { shortcut: StandardKey.ZoomOut enabled: view.sourceSize.width > 50 - icon.source: "resources/zoom-out.svg" + icon.source: "qrc:/singlepage/resources/zoom-out.svg" onTriggered: view.renderScale /= root.scaleStep } } ToolButton { action: Action { - icon.source: "resources/zoom-fit-width.svg" + icon.source: "qrc:/singlepage/resources/zoom-fit-width.svg" onTriggered: view.scaleToWidth(root.contentItem.width, root.contentItem.height) } } ToolButton { action: Action { - icon.source: "resources/zoom-fit-best.svg" + icon.source: "qrc:/singlepage/resources/zoom-fit-best.svg" onTriggered: view.scaleToPage(root.contentItem.width, root.contentItem.height) } } ToolButton { action: Action { shortcut: "Ctrl+0" - icon.source: "resources/zoom-original.svg" + icon.source: "qrc:/singlepage/resources/zoom-original.svg" onTriggered: view.resetScale() } } ToolButton { action: Action { shortcut: "Ctrl+L" - icon.source: "resources/rotate-left.svg" + icon.source: "qrc:/singlepage/resources/rotate-left.svg" onTriggered: view.pageRotation -= 90 } } ToolButton { action: Action { shortcut: "Ctrl+R" - icon.source: "resources/rotate-right.svg" + icon.source: "qrc:/singlepage/resources/rotate-right.svg" onTriggered: view.pageRotation += 90 } } ToolButton { action: Action { - icon.source: "resources/go-previous-view-page.svg" + icon.source: "qrc:/singlepage/resources/go-previous-view-page.svg" enabled: view.backEnabled onTriggered: view.back() } @@ -155,7 +104,7 @@ ApplicationWindow { } ToolButton { action: Action { - icon.source: "resources/go-next-view-page.svg" + icon.source: "qrc:/singlepage/resources/go-next-view-page.svg" enabled: view.forwardEnabled onTriggered: view.forward() } @@ -166,21 +115,24 @@ ApplicationWindow { ToolButton { action: Action { shortcut: StandardKey.SelectAll - icon.source: "resources/edit-select-all.svg" + icon.source: "qrc:/singlepage/resources/edit-select-all.svg" onTriggered: view.selectAll() } } ToolButton { action: Action { shortcut: StandardKey.Copy - icon.source: "resources/edit-copy.svg" + icon.source: "qrc:/singlepage/resources/edit-copy.svg" enabled: view.selectedText !== "" onTriggered: view.copySelectionToClipboard() } } Shortcut { sequence: StandardKey.Find - onActivated: searchField.forceActiveFocus() + onActivated: { + searchField.forceActiveFocus() + searchField.selectAll() + } } Shortcut { sequence: StandardKey.Quit @@ -189,23 +141,44 @@ ApplicationWindow { } } - Platform.FileDialog { + FileDialog { id: fileDialog title: "Open a PDF file" nameFilters: [ "PDF files (*.pdf)" ] - onAccepted: document.source = file + onAccepted: document.source = selectedFile + } + + Dialog { + id: passwordDialog + title: "Password" + standardButtons: Dialog.Ok | Dialog.Cancel + modal: true + closePolicy: Popup.CloseOnEscape + anchors.centerIn: parent + width: 300 + + contentItem: TextField { + id: passwordField + placeholderText: qsTr("Please provide the password") + echoMode: TextInput.Password + width: parent.width + onAccepted: passwordDialog.accept() + } + onOpened: function() { passwordField.forceActiveFocus() } + onAccepted: document.password = passwordField.text } Dialog { id: errorDialog title: "Error loading " + document.source - standardButtons: Dialog.Ok + standardButtons: Dialog.Close modal: true closePolicy: Popup.CloseOnEscape anchors.centerIn: parent width: 300 + visible: document.status === PdfDocument.Error - Label { + contentItem: Label { id: errorField text: document.error } @@ -218,7 +191,7 @@ ApplicationWindow { document: PdfDocument { id: document source: Qt.resolvedUrl(root.source) - onStatusChanged: if (status === PdfDocument.Error) errorDialog.open() + onPasswordRequired: passwordDialog.open() } searchString: searchField.text } @@ -237,17 +210,23 @@ ApplicationWindow { anchors.fill: parent anchors.margins: 2 model: view.searchModel + currentIndex: view.searchModel.currentResult ScrollBar.vertical: ScrollBar { } delegate: ItemDelegate { + id: resultDelegate + required property int index + required property int page + required property string contextBefore + required property string contextAfter width: parent ? parent.width : 0 RowLayout { anchors.fill: parent spacing: 0 Label { - text: "Page " + (page + 1) + ": " + text: "Page " + (resultDelegate.page + 1) + ": " } Label { - text: contextBefore + text: resultDelegate.contextBefore elide: Text.ElideLeft horizontalAlignment: Text.AlignRight Layout.fillWidth: true @@ -259,18 +238,14 @@ ApplicationWindow { width: implicitWidth } Label { - text: contextAfter + text: resultDelegate.contextAfter elide: Text.ElideRight Layout.fillWidth: true Layout.preferredWidth: parent.width / 2 } } highlighted: ListView.isCurrentItem - onClicked: { - searchResultsList.currentIndex = index - view.goToLocation(page, location, 0) - view.searchModel.currentResult = indexOnPage - } + onClicked: view.searchModel.currentResult = resultDelegate.index } } } @@ -282,8 +257,9 @@ ApplicationWindow { anchors.fill: parent ToolButton { action: Action { - icon.source: "resources/go-up-search.svg" + icon.source: "qrc:/singlepage/resources/go-up-search.svg" shortcut: StandardKey.FindPrevious + enabled: view.searchModel.count > 0 onTriggered: view.searchBack() } ToolTip.visible: enabled && hovered @@ -299,7 +275,7 @@ ApplicationWindow { onAccepted: searchDrawer.open() Image { visible: searchField.text !== "" - source: "resources/edit-clear.svg" + source: "qrc:/singlepage/resources/edit-clear.svg" anchors { right: parent.right top: parent.top @@ -314,8 +290,9 @@ ApplicationWindow { } ToolButton { action: Action { - icon.source: "resources/go-down-search.svg" + icon.source: "qrc:/singlepage/resources/go-down-search.svg" shortcut: StandardKey.FindNext + enabled: view.searchModel.count > 0 onTriggered: view.searchForward() } ToolTip.visible: enabled && hovered diff --git a/examples/pdf/pdfviewer/viewer.qrc b/examples/pdf/singlepage/viewer.qrc index ffca51679..6f8af53ac 100644 --- a/examples/pdf/pdfviewer/viewer.qrc +++ b/examples/pdf/singlepage/viewer.qrc @@ -1,5 +1,5 @@ <RCC> - <qresource prefix="/pdfviewer"> + <qresource prefix="/singlepage"> <file>viewer.qml</file> <file>resources/document-open.svg</file> <file>resources/edit-clear.svg</file> |
