make the help work using a non-interactive QProcess that calls the assistant

This commit is contained in:
Manuel Caroli 2010-07-11 19:18:34 +00:00
parent ddc1c4ea92
commit 3bb22cc580
4 changed files with 11 additions and 7 deletions

2
.gitattributes vendored
View File

@ -2571,12 +2571,12 @@ Periodic_3_triangulation_3/benchmark/Periodic_3_triangulation_3/.cdtproject -tex
Periodic_3_triangulation_3/benchmark/Periodic_3_triangulation_3/.project -text
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/MainWindow.h -text
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/MainWindow.ui -text
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Periodic_3_triangulation_3.qhcp -text
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Periodic_3_triangulation_3.qrc -text
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/data/oneH.xyz -text
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/data/oneK.xyz -text
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/documentation/Periodic_3_triangulation_3.qch -text
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/documentation/Periodic_3_triangulation_3.qhc -text
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/documentation/Periodic_3_triangulation_3.qhcp -text
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/documentation/Periodic_3_triangulation_3.qhp -text
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/documentation/images/mainwindow.png -text
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/documentation/index.html -text

View File

@ -45,6 +45,12 @@ if (CGAL_FOUND AND OPENGL_FOUND AND QT4_FOUND AND QGLVIEWER_FOUND)
qt4_generate_moc ( Scene.h moc_Scene.cpp )
qt4_generate_moc ( MainWindow.h moc_MainWindow.cpp )
# generate QtAssistant collection file
add_custom_target ( doc ALL
DEPENDS Periodic_3_triangulation_3.qhp Periodic_3_triangulation_3.qhcp
COMMAND qcollectiongenerator Periodic_3_triangulation_3.qhcp
)
# Make sure the compiler can find generated .moc files
include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
include_directories( ${QT_INCLUDE_DIR} )

View File

@ -117,17 +117,16 @@ public slots:
#endif
QStringList args;
args << QString("-enableRemoteControl");
QString help_path = QCoreApplication::applicationDirPath()
+ QDir::separator()
+ QString("./Periodic_3_triangulation_3.qhc");
args << QString("-collectionFile") << help_path;
process->start(app, args);
if (!process->waitForStarted()) {
QMessageBox::critical(this, tr("Remote Control"),
tr("Could not start Qt Assistant from %1.").arg(app));
return;
}
QString help_url = QString("qthelp://org.CGAL.demos.Periodic_3_triangulation_3/doc/index.html");
help_url = QString("setSource ") + help_url + '\0';
process->write(help_url.toLocal8Bit());
}
void about() {

View File

@ -3,7 +3,6 @@
<assistant>
<title>CGAL Periodic Delaunay Triangulation Demo</title>
<cacheDirectory>CGAL/Periodic_3_triangulation_3</cacheDirectory>
<startPage>qthelp://org.CGAL.demos.Periodic_3_triangulation_3/doc/index.html</startPage>
<enableDocumentationManager>false</enableDocumentationManager>
<enableAddressBar>false</enableAddressBar>
<enableFilterFunctionality>false</enableFilterFunctionality>