Permalink
Browse files

Fixed for index.hhp output when using template engine

  • Loading branch information...
Dimitri van Heesch
Dimitri van Heesch committed May 20, 2016
1 parent d38d33c commit e629fc64d42121e86bf2230a3b515d1d0d868dcd
Showing with 11 additions and 3 deletions.
  1. +7 −0 src/context.cpp
  2. +1 −1 src/htmlhelp.cpp
  3. +1 −0 src/htmlhelp.h
  4. +2 −2 templates/html/htmljsmenudata.tpl
View
@@ -35,6 +35,7 @@
#include "docparser.h"
#include "htmlgen.h"
#include "htmldocvisitor.h"
#include "htmlhelp.h"
#include "latexgen.h"
#include "latexdocvisitor.h"
#include "dot.h"
@@ -1006,6 +1007,10 @@ class TranslateContext::Private
{
return theTranslator->trExamplesDescription();
}
TemplateVariant langString() const
{
return HtmlHelp::getLanguageString();
}
Private()
{
static bool init=FALSE;
@@ -1195,6 +1200,8 @@ class TranslateContext::Private
s_inst.addProperty("extendsClass", &Private::extendsClass);
//%% string examplesDescription
s_inst.addProperty("examplesDescription",&Private::examplesDescription);
//%% string langstring
s_inst.addProperty("langString", &Private::langString);
init=TRUE;
}
View
@@ -447,7 +447,7 @@ void HtmlHelp::initialize()
}
static QCString getLanguageString()
QCString HtmlHelp::getLanguageString()
{
if (!theTranslator->idLanguage().isEmpty())
{
View
@@ -84,6 +84,7 @@ class HtmlHelp : public IndexIntf
void addIndexFile(const char *name);
void addImageFile(const char *);
void addStyleSheetFile(const char *) {}
static QCString getLanguageString();
private:
friend class HtmlHelpIndex;
@@ -36,9 +36,9 @@ var menudata={children:[
{% if fileList %}
,{text:'{{ tr.files }}',url:'files{{ config.HTML_FILE_EXTENSION }}',children[
{text:'{{ tr.fileList }}',url:'files{{ config.HTML_FILE_EXTENSION }}'}
{% if fileMemberIndex.all %}
{% if globalsIndex.all %}
,{text:'{{ tr.fileMembers }}',url'globals{{ config.HTML_FILE_EXTENSION }}',children:[
{% with page=fileMembersIndex %}
{% with page=globalsIndex %}
{% include 'htmljsmenumembersdata.tpl' %}
{% endwith %}
]}

0 comments on commit e629fc6

Please sign in to comment.