diff options
| author |  Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk> | 2013-08-22 16:20:47 -0300 |
|---|---|---|
| committer | Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk> | 2013-08-25 19:03:43 -0300 |
| commit | 1e6973180403e513c6c9469ec92751f083f5ff3c (patch) | |
| tree | 869b32ff65a7f821d14235c1f18d045d2e667fff | |
| parent | 2fb2918607ffb857543b9060fd9f18f0d07ab780 (diff) | |
| download | subsurface-1e6973180403e513c6c9469ec92751f083f5ff3c.tar.gz | |
use QWebView to show the user manual
Looks like the QTextBrowser can't render the manual correctly.
Also, QWebView provides a better way to find contents on a webpage,
which is an important feature for an user manual (to be implemented).
Signed-off-by: Danilo Cesar Lemes de Paula <danilo.eu@gmail.com>
| -rw-r--r-- | Configure.mk | 2 | ||||
| -rw-r--r-- | qt-ui/mainwindow.cpp | 8 | ||||
| -rw-r--r-- | qt-ui/mainwindow.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Configure.mk b/Configure.mk index a532d4138..4039db454 100644 --- a/Configure.mk +++ b/Configure.mk @@ -106,7 +106,7 @@ ifeq ($(strip $(QMAKE)),) $(error Could not find qmake or qmake-qt4 in $$PATH for the Qt4 version they failed) endif - QT_MODULES = QtGui QtSvg QtNetwork + QT_MODULES = QtGui QtSvg QtNetwork QtWebKit QT_CORE = QtCore MOC = $(shell $(PKGCONFIG) --variable=moc_location QtCore) UIC = $(shell $(PKGCONFIG) --variable=uic_location QtGui) diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index a78b84565..75f18000c 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -15,7 +15,7 @@ #include <QCloseEvent> #include <QApplication> #include <QFontMetrics> -#include <QTextBrowser> +#include <QWebView> #include <QTableView> #include "divelistview.h" #include "starwidget.h" @@ -411,14 +411,14 @@ void MainWindow::on_actionAboutSubsurface_triggered() void MainWindow::on_actionUserManual_triggered() { if(!helpView){ - helpView = new QTextBrowser(); + helpView = new QWebView(); } QString searchPath = getSubsurfaceDataPath("Documentation"); if (searchPath != "") { QUrl url(searchPath.append("/user-manual.html")); - helpView->setSource(url); + helpView->setUrl(url); } else { - helpView->setText(tr("Cannot find the Subsurface manual")); + helpView->setHtml(tr("Cannot find the Subsurface manual")); } helpView->show(); } diff --git a/qt-ui/mainwindow.h b/qt-ui/mainwindow.h index 2009740fe..0b0b0055d 100644 --- a/qt-ui/mainwindow.h +++ b/qt-ui/mainwindow.h @@ -29,7 +29,7 @@ class DiveListView; class GlobeGPS; class MainTab; class ProfileGraphicsView; -class QTextBrowser; +class QWebView; enum MainWindowTitleFormat { MWTF_DEFAULT, MWTF_FILENAME }; @@ -110,7 +110,7 @@ private: Ui::MainWindow *ui; QAction *actionNextDive; QAction *actionPreviousDive; - QTextBrowser *helpView; + QWebView *helpView; QString filter(); bool askSaveChanges(); void writeSettings(); |