diff options
| -rw-r--r-- | examples/pdfwidgets/pdfviewer/doc/src/pdfviewer.qdoc | 19 | ||||
| -rw-r--r-- | src/pdf/doc/qtpdf.qdocconf | 1 | ||||
| -rw-r--r-- | src/pdf/doc/src/qtpdf-index.qdoc | 2 | ||||
| -rw-r--r-- | src/pdf/qpdfnavigationstack.cpp | 5 | ||||
| -rw-r--r-- | src/pdfquick/PdfMultiPageView.qml | 6 | ||||
| -rw-r--r-- | src/pdfquick/qquickpdfpageimage.cpp | 2 | ||||
| -rw-r--r-- | src/pdfquick/qquickpdfselection.cpp | 1 |
7 files changed, 19 insertions, 17 deletions
diff --git a/examples/pdfwidgets/pdfviewer/doc/src/pdfviewer.qdoc b/examples/pdfwidgets/pdfviewer/doc/src/pdfviewer.qdoc index 0cdd671be..2a1531f6d 100644 --- a/examples/pdfwidgets/pdfviewer/doc/src/pdfviewer.qdoc +++ b/examples/pdfwidgets/pdfviewer/doc/src/pdfviewer.qdoc @@ -37,7 +37,7 @@ \endomit \e {PDF Viewer} demonstrates how to use the QPdfDocument class to render - PDF documents and the QPdfPageNavigation class to navigate them. + PDF documents and the QPdfNavigationStack class to navigate them. Qt Creator and the integrated Qt Designer were used to create the example UI and to connect it to the code. This affects the code, which might be @@ -58,7 +58,7 @@ The class declares public and private slots that match the actions of the selectors: - \printuntil on_actionContinuous_triggered() + \printuntil on_actionForward_triggered() The actual layout of the main window is specified in a \c{.ui} file. The widgets and actions are available at runtime in the \c ui member variable. @@ -79,16 +79,17 @@ \skipto MainWindow \printuntil { - The constructor first calls \c setupUi() to construct the zoom and page - selectors according to the UI file. We set the maximum width of the - selectors. + The constructor first calls \c setupUi() to construct most of the main window + according to the UI file. The zoom and page selectors need to be added to + the toolbar via \l QToolBar::insertWidget(), because that cannot be done + in a UI file: - \printuntil addWidget(m_pageSelector) + \printuntil insertWidget(ui->actionForward, m_pageSelector); - We use the QPdfPageNavigation class to handle the navigation through a - PDF document: + We connect relevant signals to the page selector spinbox and the browser-style + back and forward buttons: - \printuntil setPageNavigation + \printuntil forwardAvailableChanged We connect the \c zoomModeChanged and \c zoomFactor changed signals of the PDF view to the functions that reset the zoom selector: diff --git a/src/pdf/doc/qtpdf.qdocconf b/src/pdf/doc/qtpdf.qdocconf index 24f7d8b51..248cccbf2 100644 --- a/src/pdf/doc/qtpdf.qdocconf +++ b/src/pdf/doc/qtpdf.qdocconf @@ -36,6 +36,7 @@ depends += qtcore \ qmake \ qtdesigner \ qtquick \ + qtquickcontrols \ qtcmake headerdirs += ../ diff --git a/src/pdf/doc/src/qtpdf-index.qdoc b/src/pdf/doc/src/qtpdf-index.qdoc index 423a46873..b86ae7ee5 100644 --- a/src/pdf/doc/src/qtpdf-index.qdoc +++ b/src/pdf/doc/src/qtpdf-index.qdoc @@ -36,7 +36,7 @@ and renders pages from it according to the options provided by the \l QPdfDocumentRenderOptions class. The \l QPdfPageRenderer class manages a queue that collects all render requests. The - \l QPdfPageNavigation class handles the navigation through a + \l QPdfNavigationStack class handles the navigation through a PDF document. \include module-use.qdocinc using qt module diff --git a/src/pdf/qpdfnavigationstack.cpp b/src/pdf/qpdfnavigationstack.cpp index a1d193f3a..1112bf1b4 100644 --- a/src/pdf/qpdfnavigationstack.cpp +++ b/src/pdf/qpdfnavigationstack.cpp @@ -61,7 +61,7 @@ struct QPdfNavigationStackPrivate \class QPdfNavigationStack \since 6.4 \inmodule QtPdf - \brief Navigation history within a PDF document + \brief Navigation history within a PDF document. The QPdfNavigationStack class remembers which destinations the user has visited in a PDF document, and provides the ability to traverse @@ -191,8 +191,7 @@ qreal QPdfNavigationStack::currentZoom() const /*! Adds the given destination, consisting of \a page, \a location, and \a zoom, - to the history of visited locations. If \a emitJumped is \c false, the - \l jumped() signal will not be emitted. + to the history of visited locations. The \a zoom argument represents magnification (where \c 1 is the default scale, 1 logical pixel = 1 point). If \a zoom is given as \c 0, currentZoom diff --git a/src/pdfquick/PdfMultiPageView.qml b/src/pdfquick/PdfMultiPageView.qml index e2148c1fd..3182fb924 100644 --- a/src/pdfquick/PdfMultiPageView.qml +++ b/src/pdfquick/PdfMultiPageView.qml @@ -178,7 +178,7 @@ Item { Scrolls the view to the given \a page number, if possible. - \sa PdfNavigationStack::push(), currentPage + \sa PdfNavigationStack::jump(), currentPage */ function goToPage(page) { if (page === navigationStack.currentPage) @@ -192,7 +192,7 @@ Item { Scrolls the view to the \a location on the \a page, if possible, and sets the \a zoom level. - \sa PdfNavigationStack::push(), currentPage + \sa PdfNavigationStack::jump(), currentPage */ function goToLocation(page, location, zoom) { if (zoom > 0) { @@ -215,7 +215,7 @@ Item { property int currentPageRenderingStatus: Image.Null // -------------------------------- - // page navigation + // page scaling /*! \qmlproperty real PdfMultiPageView::renderScale diff --git a/src/pdfquick/qquickpdfpageimage.cpp b/src/pdfquick/qquickpdfpageimage.cpp index 024408601..9101ad5a9 100644 --- a/src/pdfquick/qquickpdfpageimage.cpp +++ b/src/pdfquick/qquickpdfpageimage.cpp @@ -48,7 +48,7 @@ Q_LOGGING_CATEGORY(qLcImg, "qt.pdf.image") /*! \qmltype PdfPageImage - \instantiates QQuickPdfPageImage +//! \instantiates QQuickPdfPageImage \inqmlmodule QtPdf \ingroup pdf \inherits Image diff --git a/src/pdfquick/qquickpdfselection.cpp b/src/pdfquick/qquickpdfselection.cpp index 5dc3c2f5d..8a43bb818 100644 --- a/src/pdfquick/qquickpdfselection.cpp +++ b/src/pdfquick/qquickpdfselection.cpp @@ -59,6 +59,7 @@ static const QRegularExpression WordDelimiter(QStringLiteral("\\s")); //! \instantiates QQuickPdfSelection \inqmlmodule QtQuick.Pdf \ingroup pdf + \inherits Item \brief A representation of a text selection within a PDF Document. \since 5.15 |