Display the Subsurface manual in the help widget

This adds a helper function to determine the Subsurface data directory
(are we running from build directory? installed on Linux? installed on
Mac? - still need to add support for Windows). This same function is
then used by both the setup for Marble and for the help browser.

This assumes that the user-manual.html file has actually been built and
installed (which we don't do by default with the current Makefile).

Right now there are rendering issues with our manual in the help browser
widget - I'm sure this can be fixed...

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2013-05-31 06:26:08 +09:00
parent 422e0f94d6
commit c972c7cbd9
4 changed files with 41 additions and 29 deletions

View file

@ -23,6 +23,7 @@
#include "../dive.h"
#include "../divelist.h"
#include "../pref.h"
#include "../helpers.h"
#include "modeldelegates.h"
#include "models.h"
#include "downloadfromdivecomputer.h"
@ -267,7 +268,13 @@ void MainWindow::on_actionUserManual_triggered()
if(!helpView){
helpView = new QTextBrowser();
}
helpView->setText(tr("HTML of Help menu here."));
QString searchPath = getSubsurfaceDataPath("Documentation");
if (searchPath != "") {
QUrl url(searchPath.append("/user-manual.html"));
helpView->setSource(url);
} else {
helpView->setText(tr("Cannot find the Subsurface manual"));
}
helpView->show();
}
@ -500,7 +507,7 @@ void MainWindow::closeEvent(QCloseEvent *event)
helpView->close();
helpView->deleteLater();
}
if (unsaved_changes() && (askSaveChanges() == FALSE)) {
event->ignore();
return;