mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'bugfixes' of github.com:danilocesar/subsurface

Browse source 
Fixed one conflict in qt-ui/diveplanner.cpp - please check I got this
right.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2013-08-30 20:17:20 -07:00
commit db17edda65
5 changed files with 56 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
qt-ui/mainwindow.cpp
View file

@ -15,7 +15,7 @@
#include <QCloseEvent>
#include <QApplication>
#include <QFontMetrics>
#include <QTextBrowser>
#include <QWebView>
#include <QTableView>
#include "divelistview.h"
#include "starwidget.h"
@ -413,14 +413,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();
}