diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2022-04-24 10:54:05 +0200 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2022-05-27 14:20:50 +0200 |
commit | 90f43fd25ec4de4d18da40c214ddb366da5c798a (patch) | |
tree | 3cdc847db7f455134c174c02e2d5f13a07ef54de /examples | |
parent | 567739fda232c28992962f32a9e652eab723a4d4 (diff) | |
download | qtwebengine-90f43fd25ec4de4d18da40c214ddb366da5c798a.tar.gz |
Rename QPdfNavigationStack to QPdfPageNavigator; QML type too
This might reduce some confusion about the fact that the back/forward
"stack" isn't strictly a stack in the data structure sense: it's more
like QUndoStack. It causes a QML source incompatibility relative to
Qt 5, but keeps the C++ class name the same as it has been in QtPdf for
a long time. Amends 3ad445f9f24a9d3f259ed1781460a63346a728e4
[ChangeLog][QtPDF] The PdfNavigationStack QML type has been renamed to
PdfPageNavigator, matching the C++ type QPdfPageNavigator. These
remember navigation history within a document, and are helpful to
implement back/forward buttons similar to those on a web browser
in both Qt Quick and widget-based viewer applications.
Change-Id: Id8dc17aa416bb7064b1f0f300a47c07c83b7f47e
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/pdfwidgets/pdfviewer/doc/src/pdfviewer.qdoc | 2 | ||||
-rw-r--r-- | examples/pdfwidgets/pdfviewer/mainwindow.cpp | 22 |
2 files changed, 12 insertions, 12 deletions
diff --git a/examples/pdfwidgets/pdfviewer/doc/src/pdfviewer.qdoc b/examples/pdfwidgets/pdfviewer/doc/src/pdfviewer.qdoc index a053f734c..f52e327a2 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 QPdfView class to render - PDF documents and the QPdfNavigationStack class to navigate them. + PDF documents and the QPdfPageNavigator 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 diff --git a/examples/pdfwidgets/pdfviewer/mainwindow.cpp b/examples/pdfwidgets/pdfviewer/mainwindow.cpp index c6747f980..a6a533d51 100644 --- a/examples/pdfwidgets/pdfviewer/mainwindow.cpp +++ b/examples/pdfwidgets/pdfviewer/mainwindow.cpp @@ -58,7 +58,7 @@ #include <QSpinBox> #include <QPdfBookmarkModel> #include <QPdfDocument> -#include <QPdfNavigationStack> +#include <QPdfPageNavigator> #include <QtMath> const qreal zoomMultiplier = qSqrt(2.0); @@ -79,10 +79,10 @@ MainWindow::MainWindow(QWidget *parent) ui->mainToolBar->insertWidget(ui->actionForward, m_pageSelector); connect(m_pageSelector, &QSpinBox::valueChanged, this, &MainWindow::pageSelected); - auto nav = ui->pdfView->pageNavigation(); - connect(nav, &QPdfNavigationStack::currentPageChanged, m_pageSelector, &QSpinBox::setValue); - connect(nav, &QPdfNavigationStack::backAvailableChanged, ui->actionBack, &QAction::setEnabled); - connect(nav, &QPdfNavigationStack::forwardAvailableChanged, ui->actionForward, &QAction::setEnabled); + auto nav = ui->pdfView->pageNavigator(); + connect(nav, &QPdfPageNavigator::currentPageChanged, m_pageSelector, &QSpinBox::setValue); + connect(nav, &QPdfPageNavigator::backAvailableChanged, ui->actionBack, &QAction::setEnabled); + connect(nav, &QPdfPageNavigator::forwardAvailableChanged, ui->actionForward, &QAction::setEnabled); connect(m_zoomSelector, &ZoomSelector::zoomModeChanged, ui->pdfView, &QPdfView::setZoomMode); connect(m_zoomSelector, &ZoomSelector::zoomFactorChanged, ui->pdfView, &QPdfView::setZoomFactor); @@ -129,12 +129,12 @@ void MainWindow::bookmarkSelected(const QModelIndex &index) const int page = index.data(int(QPdfBookmarkModel::Role::Page)).toInt(); const qreal zoomLevel = index.data(int(QPdfBookmarkModel::Role::Level)).toReal(); - ui->pdfView->pageNavigation()->jump(page, {}, zoomLevel); + ui->pdfView->pageNavigator()->jump(page, {}, zoomLevel); } void MainWindow::pageSelected(int page) { - auto nav = ui->pdfView->pageNavigation(); + auto nav = ui->pdfView->pageNavigator(); nav->jump(page, {}, nav->currentZoom()); } @@ -173,13 +173,13 @@ void MainWindow::on_actionZoom_Out_triggered() void MainWindow::on_actionPrevious_Page_triggered() { - auto nav = ui->pdfView->pageNavigation(); + auto nav = ui->pdfView->pageNavigator(); nav->jump(nav->currentPage() - 1, {}, nav->currentZoom()); } void MainWindow::on_actionNext_Page_triggered() { - auto nav = ui->pdfView->pageNavigation(); + auto nav = ui->pdfView->pageNavigator(); nav->jump(nav->currentPage() + 1, {}, nav->currentZoom()); } @@ -192,10 +192,10 @@ void MainWindow::on_actionContinuous_triggered() void MainWindow::on_actionBack_triggered() { - ui->pdfView->pageNavigation()->back(); + ui->pdfView->pageNavigator()->back(); } void MainWindow::on_actionForward_triggered() { - ui->pdfView->pageNavigation()->forward(); + ui->pdfView->pageNavigator()->forward(); } |