summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2014-03-23 15:16:24 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2014-03-23 15:16:24 (GMT)
commit2790daaa7799fc3148b8106b357da9f8e9f4a07f (patch)
treeb1da9c5debed528cbf794fef9c398c3b7cfc2888
parent030aad9a6e82b0655a54a2d158080d542d6d8aaf (diff)
parente6a78b6b2573388353bdb5dcd7a13dcc11959d13 (diff)
downloadDoxygen-2790daaa7799fc3148b8106b357da9f8e9f4a07f.zip
Doxygen-2790daaa7799fc3148b8106b357da9f8e9f4a07f.tar.gz
Doxygen-2790daaa7799fc3148b8106b357da9f8e9f4a07f.tar.bz2
Merge pull request #146 from albert-github/feature/extension_chm_prev_next
Enable Previous and Next buttons in chm output file
-rw-r--r--src/config.xml3
-rw-r--r--src/htmlhelp.cpp28
2 files changed, 24 insertions, 7 deletions
diff --git a/src/config.xml b/src/config.xml
index 1506b65..c832112 100644
--- a/src/config.xml
+++ b/src/config.xml
@@ -2029,7 +2029,8 @@ The \c DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
<![CDATA[
The \c BINARY_TOC flag
controls whether a binary table of contents is generated (\c YES) or a
- normal table of contents (\c NO) in the `.chm` file.
+ normal table of contents (\c NO) in the `.chm` file. Furthermore it enables
+ the `Previous` and `Next` buttons.
]]>
</docs>
</option>
diff --git a/src/htmlhelp.cpp b/src/htmlhelp.cpp
index 754893d..c4b8950 100644
--- a/src/htmlhelp.cpp
+++ b/src/htmlhelp.cpp
@@ -495,9 +495,22 @@ void HtmlHelp::createProjectFile()
// the font-size one is not normally settable by the HTML Help Workshop
// utility but the way to set it is described here:
// http://support.microsoft.com/?scid=kb%3Ben-us%3B240062&x=17&y=18
- t << "main=\"" << recode(Config_getString("PROJECT_NAME")) << "\",\"index.hhc\","
+ // NOTE: the 0x70387e number in addition to the above the Next and Prev button
+ // are shown. They can only be shown in case of a binary toc.
+ // dee http://www.mif2go.com/xhtml/htmlhelp_0016_943addingtabsandtoolbarbuttonstohtmlhelp.htm#Rz108x95873
+ // Value has been taken from htmlhelp.h file of the HTML Help Workshop
+ if (Config_getBool("BINARY_TOC"))
+ {
+ t << "main=\"" << recode(Config_getString("PROJECT_NAME")) << "\",\"index.hhc\","
+ "\"index.hhk\",\"" << indexName << "\",\"" <<
+ indexName << "\",,,,,0x23520,,0x70387e,,,,,,,,0" << endl << endl;
+ }
+ else
+ {
+ t << "main=\"" << recode(Config_getString("PROJECT_NAME")) << "\",\"index.hhc\","
"\"index.hhk\",\"" << indexName << "\",\"" <<
indexName << "\",,,,,0x23520,,0x10387e,,,,,,,,0" << endl << endl;
+ }
t << "[FILES]" << endl;
char *s = indexFiles.first();
@@ -620,11 +633,14 @@ void HtmlHelp::addContentsItem(bool isDir,
Definition * /* def */)
{
// If we're using a binary toc then folders cannot have links.
- if(Config_getBool("BINARY_TOC") && isDir)
- {
- file = 0;
- anchor = 0;
- }
+ // Tried this and I didn't see any problems, when not using
+ // the resetting of file and anchor the TOC works better
+ // (prev / next button)
+ //if(Config_getBool("BINARY_TOC") && isDir)
+ //{
+ //file = 0;
+ //anchor = 0;
+ //}
int i; for (i=0;i<dc;i++) cts << " ";
cts << "<LI><OBJECT type=\"text/sitemap\">";
cts << "<param name=\"Name\" value=\"" << convertToHtml(recode(name),TRUE) << "\">";