1 files changed, 68 insertions, 8 deletions

diff --git a/examples/pdfwidgets/pdfviewer/mainwindow.cpp b/examples/pdfwidgets/pdfviewer/mainwindow.cpp
index 02caffa48..ce19359fc 100644
--- a/examples/pdfwidgets/pdfviewer/mainwindow.cpp
+++ b/examples/pdfwidgets/pdfviewer/mainwindow.cpp
@@ -4,14 +4,18 @@
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 
+#include "searchresultdelegate.h"
 #include "zoomselector.h"
 
 #include <QFileDialog>
+#include <QLineEdit>
 #include <QMessageBox>
-#include <QSpinBox>
 #include <QPdfBookmarkModel>
 #include <QPdfDocument>
 #include <QPdfPageNavigator>
+#include <QPdfPageSelector>
+#include <QPdfSearchModel>
+#include <QShortcut>
 #include <QStandardPaths>
 #include <QtMath>
 
@@ -23,7 +27,9 @@ MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)
     , ui(new Ui::MainWindow)
     , m_zoomSelector(new ZoomSelector(this))
-    , m_pageSelector(new QSpinBox(this))
+    , m_pageSelector(new QPdfPageSelector(this))
+    , m_searchModel(new QPdfSearchModel(this))
+    , m_searchField(new QLineEdit(this))
     , m_document(new QPdfDocument(this))
 {
     ui->setupUi(this);
@@ -32,9 +38,10 @@ MainWindow::MainWindow(QWidget *parent)
     ui->mainToolBar->insertWidget(ui->actionZoom_In, m_zoomSelector);
 
     ui->mainToolBar->insertWidget(ui->actionForward, m_pageSelector);
-    connect(m_pageSelector, &QSpinBox::valueChanged, this, &MainWindow::pageSelected);
+    connect(m_pageSelector, &QPdfPageSelector::currentPageChanged, this, &MainWindow::pageSelected);
+    m_pageSelector->setDocument(m_document);
     auto nav = ui->pdfView->pageNavigator();
-    connect(nav, &QPdfPageNavigator::currentPageChanged, m_pageSelector, &QSpinBox::setValue);
+    connect(nav, &QPdfPageNavigator::currentPageChanged, m_pageSelector, &QPdfPageSelector::setCurrentPage);
     connect(nav, &QPdfPageNavigator::backAvailableChanged, ui->actionBack, &QAction::setEnabled);
     connect(nav, &QPdfPageNavigator::forwardAvailableChanged, ui->actionForward, &QAction::setEnabled);
 
@@ -48,7 +55,24 @@ MainWindow::MainWindow(QWidget *parent)
     ui->bookmarkView->setModel(bookmarkModel);
     connect(ui->bookmarkView, &QAbstractItemView::activated, this, &MainWindow::bookmarkSelected);
 
-    ui->tabWidget->setTabEnabled(1, false); // disable 'Pages' tab for now
+    ui->thumbnailsView->setModel(m_document->pageModel());
+
+    m_searchModel->setDocument(m_document);
+    ui->pdfView->setSearchModel(m_searchModel);
+    ui->searchToolBar->insertWidget(ui->actionFindPrevious, m_searchField);
+    connect(new QShortcut(QKeySequence::Find, this), &QShortcut::activated, this, [this]() {
+        m_searchField->setFocus(Qt::ShortcutFocusReason);
+    });
+    m_searchField->setPlaceholderText(tr("Find in document"));
+    m_searchField->setMaximumWidth(400);
+    connect(m_searchField, &QLineEdit::textEdited, this, [this](const QString &text) {
+        m_searchModel->setSearchString(text);
+        ui->tabWidget->setCurrentWidget(ui->searchResultsTab);
+    });
+    ui->searchResultsView->setModel(m_searchModel);
+    ui->searchResultsView->setItemDelegate(new SearchResultDelegate(this));
+    connect(ui->searchResultsView->selectionModel(), &QItemSelectionModel::currentChanged,
+            this, &MainWindow::searchResultSelected);
 
     ui->pdfView->setDocument(m_document);
 
@@ -65,10 +89,7 @@ void MainWindow::open(const QUrl &docLocation)
 {
     if (docLocation.isLocalFile()) {
         m_document->load(docLocation.toLocalFile());
-        const auto documentTitle = m_document->metaData(QPdfDocument::MetaDataField::Title).toString();
-        setWindowTitle(!documentTitle.isEmpty() ? documentTitle : QStringLiteral("PDF Viewer"));
         pageSelected(0);
-        m_pageSelector->setMaximum(m_document->pageCount() - 1);
     } else {
         const QString message = tr("%1 is not a valid local file").arg(docLocation.toString());
         qCDebug(lcExample).noquote() << message;
@@ -91,6 +112,23 @@ void MainWindow::pageSelected(int page)
 {
     auto nav = ui->pdfView->pageNavigator();
     nav->jump(page, {}, nav->currentZoom());
+    const auto documentTitle = m_document->metaData(QPdfDocument::MetaDataField::Title).toString();
+    setWindowTitle(!documentTitle.isEmpty() ? documentTitle : QStringLiteral("PDF Viewer"));
+    setWindowTitle(tr("%1: page %2 (%3 of %4)")
+                   .arg(documentTitle.isEmpty() ? u"PDF Viewer"_qs : documentTitle,
+                        m_pageSelector->currentPageLabel(), QString::number(page + 1), QString::number(m_document->pageCount())));
+}
+
+void MainWindow::searchResultSelected(const QModelIndex &current, const QModelIndex &previous)
+{
+    Q_UNUSED(previous);
+    if (!current.isValid())
+        return;
+
+    const int page = current.data(int(QPdfSearchModel::Role::Page)).toInt();
+    const QPointF location = current.data(int(QPdfSearchModel::Role::Location)).toPointF();
+    ui->pdfView->pageNavigator()->jump(page, location);
+    ui->pdfView->setCurrentSearchResultIndex(current.row());
 }
 
 void MainWindow::on_actionOpen_triggered()
@@ -147,6 +185,12 @@ void MainWindow::on_actionNext_Page_triggered()
     nav->jump(nav->currentPage() + 1, {}, nav->currentZoom());
 }
 
+void MainWindow::on_thumbnailsView_activated(const QModelIndex &index)
+{
+    auto nav = ui->pdfView->pageNavigator();
+    nav->jump(index.row(), {}, nav->currentZoom());
+}
+
 void MainWindow::on_actionContinuous_triggered()
 {
     ui->pdfView->setPageMode(ui->actionContinuous->isChecked() ?
@@ -163,3 +207,19 @@ void MainWindow::on_actionForward_triggered()
 {
     ui->pdfView->pageNavigator()->forward();
 }
+
+void MainWindow::on_actionFindNext_triggered()
+{
+    int next = ui->searchResultsView->currentIndex().row() + 1;
+    if (next >= m_searchModel->rowCount({}))
+        next = 0;
+    ui->searchResultsView->setCurrentIndex(m_searchModel->index(next));
+}
+
+void MainWindow::on_actionFindPrevious_triggered()
+{
+    int prev = ui->searchResultsView->currentIndex().row() - 1;
+    if (prev < 0)
+        prev = m_searchModel->rowCount({}) - 1;
+    ui->searchResultsView->setCurrentIndex(m_searchModel->index(prev));
+}