summaryrefslogtreecommitdiffstats
path: root/src/index.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/index.cpp')
-rw-r--r--src/index.cpp68
1 files changed, 42 insertions, 26 deletions
diff --git a/src/index.cpp b/src/index.cpp
index cd93d8c..7e494f8 100644
--- a/src/index.cpp
+++ b/src/index.cpp
@@ -46,10 +46,6 @@
#define MAX_ITEMS_BEFORE_MULTIPAGE_INDEX 200
#define MAX_ITEMS_BEFORE_QUICK_INDEX 30
-static const char search_styleSheet[] =
-#include "search_css.h"
-;
-
static const char search_script[]=
#include "search_js.h"
;
@@ -195,13 +191,20 @@ QCString abbreviate(const char *s,const char *name)
//----------------------------------------------------------------------------
-static void startQuickIndexList(OutputList &ol)
+static void startQuickIndexList(OutputList &ol,bool letterTabs=FALSE)
{
bool fancyTabs = TRUE;
if (fancyTabs)
{
- ol.writeString(" <div class=\"tabs\">\n");
- ol.writeString(" <ul>\n");
+ if (letterTabs)
+ {
+ ol.writeString(" <div class=\"tabs3\">\n");
+ }
+ else
+ {
+ ol.writeString(" <div class=\"tabs2\">\n");
+ }
+ ol.writeString(" <ul class=\"tablist\">\n");
}
else
{
@@ -267,8 +270,10 @@ static QCString fixSpaces(const QCString &s)
}
-void startTitle(OutputList &ol,const char *fileName)
+void startTitle(OutputList &ol,const char *fileName,Definition *def)
{
+ ol.startHeaderSection();
+ if (def) def->writeSummaryLinks(ol);
ol.startTitleHead(fileName);
ol.pushGeneratorState();
ol.disable(OutputGenerator::Man);
@@ -278,6 +283,7 @@ void endTitle(OutputList &ol,const char *fileName,const char *name)
{
ol.popGeneratorState();
ol.endTitleHead(fileName,name);
+ ol.endHeaderSection();
}
void startFile(OutputList &ol,const char *name,const char *manName,
@@ -291,14 +297,14 @@ void startFile(OutputList &ol,const char *name,const char *manName,
if (!additionalIndices)
{
ol.endQuickIndices();
- ol.startContents();
+ //ol.startContents();
}
}
else
{
if (!additionalIndices)
{
- ol.startContents();
+ // ol.startContents();
}
}
}
@@ -689,6 +695,7 @@ void writeHierarchicalIndex(OutputList &ol)
//}
ol.parseText(title);
endTitle(ol,0,0);
+ ol.startContents();
ol.startTextBlock();
Doxygen::indexList.addContentsItem(TRUE,title,0,"hierarchy",0);
if (Config_getBool("HAVE_DOT") && Config_getBool("GRAPHICAL_HIERARCHY"))
@@ -742,6 +749,7 @@ void writeGraphicalClassHierarchy(OutputList &ol)
//}
ol.parseText(title);
endTitle(ol,0,0);
+ ol.startContents();
ol.startTextBlock();
Doxygen::indexList.addContentsItem(FALSE,theTranslator->trGraphicalHierarchy(),0,"inherits",0);
ol.startParagraph();
@@ -807,6 +815,7 @@ void writeFileIndex(OutputList &ol)
//}
ol.parseText(title);
endTitle(ol,0,0);
+ ol.startContents();
ol.startTextBlock();
Doxygen::indexList.addContentsItem(TRUE,theTranslator->trFileList(),0,"files",0);
Doxygen::indexList.incContentsDepth();
@@ -992,6 +1001,7 @@ void writeNamespaceIndex(OutputList &ol)
//}
ol.parseText(longTitle);
endTitle(ol,0,0);
+ ol.startContents();
ol.startTextBlock();
Doxygen::indexList.addContentsItem(TRUE,title,0,"namespaces",0);
Doxygen::indexList.incContentsDepth();
@@ -1433,6 +1443,7 @@ void writeAlphabeticalIndex(OutputList &ol)
theTranslator->trCompoundIndex()
));
endTitle(ol,0,0);
+ ol.startContents();
writeAlphabeticalClassList(ol);
endFile(ol);
ol.popGeneratorState();
@@ -1460,6 +1471,7 @@ void writeAnnotatedIndex(OutputList &ol)
//}
ol.parseText(longTitle);
endTitle(ol,0,0);
+ ol.startContents();
ol.startTextBlock();
Doxygen::indexList.addContentsItem(TRUE,title,0,"annotated",0);
Doxygen::indexList.incContentsDepth();
@@ -1834,7 +1846,7 @@ void writeQuickMemberIndex(OutputList &ol,
{
bool first=TRUE;
int i;
- startQuickIndexList(ol);
+ startQuickIndexList(ol,TRUE);
for (i=33;i<127;i++)
{
char is[2];is[0]=(char)i;is[1]='\0';
@@ -2899,18 +2911,6 @@ void writeJavascriptSearchIndex()
Doxygen::indexList.addStyleSheetFile("search/search.js");
}
-void writeSearchStyleSheet()
-{
- QCString searchDirName = Config_getString("HTML_OUTPUT")+"/search";
- QFile f(searchDirName+"/search.css");
- if (f.open(IO_WriteOnly))
- {
- QTextStream t(&f);
- t << search_styleSheet;
- }
- Doxygen::indexList.addStyleSheetFile("search/search.css");
-}
-
void writeSearchCategories(QTextStream &t)
{
static SearchIndexCategoryMapping map;
@@ -2945,6 +2945,7 @@ void writeExampleIndex(OutputList &ol)
//}
ol.parseText(title);
endTitle(ol,0,0);
+ ol.startContents();
ol.startTextBlock();
Doxygen::indexList.addContentsItem(TRUE,theTranslator->trExamples(),0,"examples",0);
Doxygen::indexList.incContentsDepth();
@@ -3042,6 +3043,7 @@ void writePageIndex(OutputList &ol)
//}
ol.parseText(title);
endTitle(ol,0,0);
+ ol.startContents();
ol.startTextBlock();
//Doxygen::indexList.addContentsItem(TRUE,theTranslator->trRelatedPages(),0,"pages",0);
//Doxygen::indexList.incContentsDepth();
@@ -3134,6 +3136,7 @@ void writeGraphInfo(OutputList &ol)
startTitle(ol,0);
ol.parseText(theTranslator->trLegendTitle());
endTitle(ol,0,0);
+ ol.startContents();
bool &stripCommentsStateRef = Config_getBool("STRIP_CODE_COMMENTS");
bool oldStripCommentsState = stripCommentsStateRef;
// temporarily disable the stripping of comments for our own code example!
@@ -3503,6 +3506,7 @@ void writeGroupIndex(OutputList &ol)
//}
ol.parseText(title);
endTitle(ol,0,0);
+ ol.startContents();
ol.startTextBlock();
Doxygen::indexList.addContentsItem(TRUE,theTranslator->trModules(),0,"modules",0);
Doxygen::indexList.incContentsDepth();
@@ -3549,6 +3553,7 @@ void writeDirIndex(OutputList &ol)
//}
ol.parseText(title);
endTitle(ol,0,0);
+ ol.startContents();
ol.startTextBlock();
Doxygen::indexList.addContentsItem(TRUE,theTranslator->trDirIndex(),0,"dirs",0);
Doxygen::indexList.incContentsDepth();
@@ -3641,25 +3646,35 @@ void writeIndex(OutputList &ol)
ol.writeQuickLinks(TRUE,HLI_Main);
ol.endQuickIndices();
}
- ol.startContents();
- ol.startTitleHead(0);
+ bool headerWritten=FALSE;
if (Doxygen::mainPage && !Doxygen::mainPage->title().isEmpty())
{
if (Doxygen::mainPage->title().lower()!="notitle")
{
+ ol.startHeaderSection();
+ ol.startTitleHead(0);
ol.parseDoc(Doxygen::mainPage->docFile(),Doxygen::mainPage->docLine(),
Doxygen::mainPage,0,Doxygen::mainPage->title(),
TRUE,FALSE,0,TRUE,FALSE);
+ headerWritten = TRUE;
}
}
else
{
if (!Config_getString("PROJECT_NAME").isEmpty())
{
+ ol.startHeaderSection();
+ ol.startTitleHead(0);
ol.parseText(projPrefix+theTranslator->trDocumentation());
+ headerWritten = TRUE;
}
}
- ol.endTitleHead(0,0);
+ if (headerWritten)
+ {
+ ol.endTitleHead(0,0);
+ ol.endHeaderSection();
+ }
+ ol.startContents();
// ol.newParagraph(); // FIXME:PARA
if (!Config_getString("PROJECT_NUMBER").isEmpty())
{
@@ -3883,6 +3898,7 @@ void writeIndex(OutputList &ol)
Doxygen::insideMainPage=TRUE;
ol.disable(OutputGenerator::Man);
startFile(ol,Doxygen::mainPage->name(),0,Doxygen::mainPage->title());
+ ol.startContents();
ol.startTextBlock();
ol.parseDoc(defFileName,defLine,Doxygen::mainPage,0,
Doxygen::mainPage->documentation(),FALSE,FALSE