From 8b00f8ffe6597a233814708d19b286e5dc0c65d8 Mon Sep 17 00:00:00 2001 From: Sergey Starosek Date: Thu, 9 Jan 2014 19:21:29 +0200 Subject: [PATCH] Extract user manual web view into a separate class Provide search functionality which addresses ticket #391 Signed-off-by: Sergey Starosek Signed-off-by: Dirk Hohndel --- qt-ui/usermanual.cpp | 93 ++++++++++++++++++++++++ qt-ui/usermanual.h | 32 +++++++++ qt-ui/usermanual.ui | 165 +++++++++++++++++++++++++++++++++++++++++++ subsurface.pro | 9 ++- 4 files changed, 296 insertions(+), 3 deletions(-) create mode 100644 qt-ui/usermanual.cpp create mode 100644 qt-ui/usermanual.h create mode 100644 qt-ui/usermanual.ui diff --git a/qt-ui/usermanual.cpp b/qt-ui/usermanual.cpp new file mode 100644 index 000000000..56f0fe1c3 --- /dev/null +++ b/qt-ui/usermanual.cpp @@ -0,0 +1,93 @@ +#include + +#include "usermanual.h" +#include "ui_usermanual.h" + +#include "../helpers.h" + +UserManual::UserManual(QWidget *parent) : + QWidget(parent), + ui(new Ui::UserManual) +{ + ui->setupUi(this); + + QAction *actionShowSearch = new QAction(this); + actionShowSearch->setShortcut(Qt::CTRL + Qt::Key_F); + actionShowSearch->setShortcutContext(Qt::WindowShortcut); + addAction(actionShowSearch); + + QAction *actionHideSearch = new QAction(this); + actionHideSearch->setShortcut(Qt::Key_Escape); + actionHideSearch->setShortcutContext(Qt::WindowShortcut); + addAction(actionHideSearch); + + ui->webView->page()->setLinkDelegationPolicy(QWebPage::DelegateExternalLinks); + QString searchPath = getSubsurfaceDataPath("Documentation"); + if (searchPath != "") { + QUrl url(searchPath.append("/user-manual.html")); + ui->webView->setWindowTitle(tr("User Manual")); + ui->webView->setWindowIcon(QIcon(":/subsurface-icon")); + ui->webView->setUrl(url); + } else { + ui->webView->setHtml(tr("Cannot find the Subsurface manual")); + } + ui->searchPanel->setParent(this); + ui->searchPanel->hide(); + + connect(actionShowSearch, SIGNAL(triggered(bool)), this, SLOT(showSearchPanel())); + connect(actionHideSearch, SIGNAL(triggered(bool)), this, SLOT(hideSearchPanel())); + connect(ui->webView, SIGNAL(linkClicked(QUrl)), this, SLOT(linkClickedSlot(QUrl))); + connect(ui->searchEdit, SIGNAL(textChanged(QString)), this, SLOT(searchTextChanged(QString))); + connect(ui->findNext, SIGNAL(clicked()), this, SLOT(searchNext())); + connect(ui->findPrev, SIGNAL(clicked()), this, SLOT(searchPrev())); +} + +void UserManual::showSearchPanel() +{ + ui->searchPanel->show(); + ui->searchEdit->setFocus(); + ui->searchEdit->selectAll(); +} + +void UserManual::hideSearchPanel() +{ + ui->searchPanel->hide(); +} + +void UserManual::search(QString text, QWebPage::FindFlags flags = 0) +{ + if (ui->webView->findText(text, flags) || text.length() == 0) { + ui->searchEdit->setStyleSheet(""); + } else { + ui->searchEdit->setStyleSheet("QLineEdit{background: red;}"); + } +} + +void UserManual::searchTextChanged(QString text) { + bool hasText = text.length() > 0; + + ui->findPrev->setEnabled(hasText); + ui->findNext->setEnabled(hasText); + + search(text); +} + +void UserManual::searchNext() +{ + search(ui->searchEdit->text()); +} + +void UserManual::searchPrev() +{ + search(ui->searchEdit->text(), QWebPage::FindBackward); +} + +void UserManual::linkClickedSlot(QUrl url) +{ + QDesktopServices::openUrl(url); +} + +UserManual::~UserManual() +{ + delete ui; +} diff --git a/qt-ui/usermanual.h b/qt-ui/usermanual.h new file mode 100644 index 000000000..f915f4c1e --- /dev/null +++ b/qt-ui/usermanual.h @@ -0,0 +1,32 @@ +#ifndef USERMANUAL_H +#define USERMANUAL_H + +#include +#include + +namespace Ui { +class UserManual; +} + +class UserManual : public QWidget +{ + Q_OBJECT + +public: + explicit UserManual(QWidget *parent = 0); + ~UserManual(); + +private slots: + void showSearchPanel(); + void hideSearchPanel(); + void searchTextChanged(QString); + void searchNext(); + void searchPrev(); + void linkClickedSlot(QUrl url); + +private: + Ui::UserManual *ui; + void search(QString, QWebPage::FindFlags); +}; + +#endif // USERMANUAL_H diff --git a/qt-ui/usermanual.ui b/qt-ui/usermanual.ui new file mode 100644 index 000000000..de0784f39 --- /dev/null +++ b/qt-ui/usermanual.ui @@ -0,0 +1,165 @@ + + + UserManual + + + + 0 + 0 + 834 + 599 + + + + + + + + 0 + 0 + + + + + 230 + 40 + + + + true + + + QFrame::NoFrame + + + + 0 + + + 9 + + + 9 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 100 + 0 + + + + + + + + false + + + + + + + + + + + true + + + + + + + false + + + + 0 + 0 + + + + + + + + + + + + true + + + + + + + + + + + + + + + true + + + + + + + + + + + 1 + 1 + + + + + + + + + + QWebView + QWidget +
qwebview.h
+ + + + + + findClose + clicked() + searchPanel + hide() + + + 261 + 568 + + + 192 + 554 + + + + + diff --git a/subsurface.pro b/subsurface.pro index e40de0991..5b56e4fce 100644 --- a/subsurface.pro +++ b/subsurface.pro @@ -56,7 +56,8 @@ HEADERS = \ webservice.h \ qt-ui/divelogimportdialog.h \ qt-ui/tagwidget.h \ - qt-ui/groupedlineedit.h + qt-ui/groupedlineedit.h \ + qt-ui/usermanual.h SOURCES = \ deco.c \ @@ -105,7 +106,8 @@ SOURCES = \ uemis-downloader.c \ qt-ui/divelogimportdialog.cpp \ qt-ui/tagwidget.cpp \ - qt-ui/groupedlineedit.cpp + qt-ui/groupedlineedit.cpp \ + qt-ui/usermanual.cpp linux*: SOURCES += linux.c mac: SOURCES += macos.c @@ -124,7 +126,8 @@ FORMS = \ qt-ui/shifttimes.ui \ qt-ui/webservices.ui \ qt-ui/tableview.ui \ - qt-ui/divelogimportdialog.ui + qt-ui/divelogimportdialog.ui \ + qt-ui/usermanual.ui RESOURCES = subsurface.qrc