mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Switch to new UserManual implementation

Browse source 
This enables search within user manual by pressing Ctrl-F.
Esc key closes search panel.

Signed-off-by: Sergey Starosek <sergey.starosek@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Sergey Starosek 2014-01-09 19:21:30 +02:00 committed by Dirk Hohndel
parent 8b00f8ffe6
commit 8ded16fd1b
2 changed files with 3 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
qt-ui/mainwindow.cpp
View file

@ -484,27 +484,11 @@ void MainWindow::on_actionAboutSubsurface_triggered()
void MainWindow::on_actionUserManual_triggered() void MainWindow::on_actionUserManual_triggered()
{ {
if(!helpView){ if(!helpView){
helpView = new QWebView(); helpView = new UserManual();
helpView->page()->setLinkDelegationPolicy(QWebPage::DelegateExternalLinks);
connect(helpView, SIGNAL(linkClicked(QUrl)), this, SLOT(linkClickedSlot(QUrl)));
}
QString searchPath = getSubsurfaceDataPath("Documentation");
if (searchPath != "") {
QUrl url(searchPath.append("/user-manual.html"));
helpView->setWindowTitle(tr("User Manual"));
helpView->setWindowIcon(QIcon(":/subsurface-icon"));
helpView->setUrl(url);
} else {
helpView->setHtml(tr("Cannot find the Subsurface manual"));
} }
helpView->show(); helpView->show();
} }
void MainWindow::linkClickedSlot(QUrl url)
{
QDesktopServices::openUrl(url);
}
QString MainWindow::filter() QString MainWindow::filter()
{ {
QString f; QString f;

4
qt-ui/mainwindow.h
View file

@ -12,6 +12,7 @@
#include <QUrl> #include <QUrl>
#include "ui_mainwindow.h" #include "ui_mainwindow.h"
#include "usermanual.h"
struct DiveList; struct DiveList;
class QSortFilterProxyModel; class QSortFilterProxyModel;
@ -102,7 +103,6 @@ private slots:
void initialUiSetup(); void initialUiSetup();
void on_actionImportDiveLog_triggered(); void on_actionImportDiveLog_triggered();
void linkClickedSlot(QUrl url);
protected: protected:
void closeEvent(QCloseEvent *); void closeEvent(QCloseEvent *);
@ -117,7 +117,7 @@ private:
Ui::MainWindow ui; Ui::MainWindow ui;
QAction *actionNextDive; QAction *actionNextDive;
QAction *actionPreviousDive; QAction *actionPreviousDive;
QWebView *helpView; UserManual *helpView;
CurrentState state; CurrentState state;
QString filter(); QString filter();
bool askSaveChanges(); bool askSaveChanges();