tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Install and use webhelp on Windows. Could not get the fragment to work for context-sensitive help, so this is always better.

Browse Source
This commit is contained in:
Jean-Francois Dockes 2016-01-07 17:22:27 +01:00
parent ac20f35933
commit 425fb717dd
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/qtgui/rclm_view.cpp
View File

@ -442,13 +442,21 @@ void RclMain::startManual(const string& index)
LOGDEB(("RclMain::startManual: help index is %s\n", LOGDEB(("RclMain::startManual: help index is %s\n",
index.empty()?"(null)":index.c_str())); 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 += "#";
usermanual += index; usermanual += index;
} }
Rcl::Doc doc; Rcl::Doc doc;
if (has_wh && index.empty()) { if (has_wh && indexempty) {
doc.url = path_pathtofileurl(webhelp); doc.url = path_pathtofileurl(webhelp);
} else { } else {
doc.url = path_pathtofileurl(usermanual); doc.url = path_pathtofileurl(usermanual);

3
src/windows/mkinstdir.sh
View File

@ -119,6 +119,9 @@ copyrecoll()
chkcp $RCL/COPYING $DESTDIR/COPYING.txt chkcp $RCL/COPYING $DESTDIR/COPYING.txt
chkcp $RCL/doc/user/usermanual.html $DESTDIR/Share/doc 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/fields $DESTDIR/Share/examples
chkcp $RCL/sampleconf/fragbuts.xml $DESTDIR/Share/examples chkcp $RCL/sampleconf/fragbuts.xml $DESTDIR/Share/examples
chkcp $RCL/windows/mimeconf $DESTDIR/Share/examples chkcp $RCL/windows/mimeconf $DESTDIR/Share/examples