From 425fb717dd8998d27bcefbff3592f06456b5d9f4 Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Thu, 7 Jan 2016 17:22:27 +0100 Subject: [PATCH] Install and use webhelp on Windows. Could not get the fragment to work for context-sensitive help, so this is always better. --- src/qtgui/rclm_view.cpp | 14 +++++++++++--- src/windows/mkinstdir.sh | 3 +++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/qtgui/rclm_view.cpp b/src/qtgui/rclm_view.cpp index f23332be..d7289584 100644 --- a/src/qtgui/rclm_view.cpp +++ b/src/qtgui/rclm_view.cpp @@ -442,13 +442,21 @@ void RclMain::startManual(const string& index) LOGDEB(("RclMain::startManual: help index is %s\n", index.empty()?"(null)":index.c_str())); - if (!index.empty()) { + bool indexempty = index.empty(); + +#ifdef _WIN32 + // On Windows I could not find any way to pass the fragment through + // rclstartw (tried to set text/html as exception with rclstartw %u). + // So always start the webhelp + indexempty = true; +#endif + + if (!indexempty) { usermanual += "#"; usermanual += index; } - Rcl::Doc doc; - if (has_wh && index.empty()) { + if (has_wh && indexempty) { doc.url = path_pathtofileurl(webhelp); } else { doc.url = path_pathtofileurl(usermanual); diff --git a/src/windows/mkinstdir.sh b/src/windows/mkinstdir.sh index 32146df1..66e412c3 100644 --- a/src/windows/mkinstdir.sh +++ b/src/windows/mkinstdir.sh @@ -119,6 +119,9 @@ copyrecoll() chkcp $RCL/COPYING $DESTDIR/COPYING.txt chkcp $RCL/doc/user/usermanual.html $DESTDIR/Share/doc + chkcp $RCL/doc/user/docbook-xsl.css $DESTDIR/Share/doc + mkdir -p $DESTDIR/Share/doc/webhelp + cp -rp $RCL/doc/user/webhelp/docs/* $DESTDIR/Share/doc/webhelp chkcp $RCL/sampleconf/fields $DESTDIR/Share/examples chkcp $RCL/sampleconf/fragbuts.xml $DESTDIR/Share/examples chkcp $RCL/windows/mimeconf $DESTDIR/Share/examples