summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2010-05-06 12:48:05 (GMT)
committerMartin Smith <msmith@trolltech.com>2010-05-06 12:48:05 (GMT)
commit573be7e7ba19a2e826d17f5f78e272ee250831d0 (patch)
tree9d0092854115a052c6c9ad78680e0aba0c8adbe7 /tools
parenta9fb306a1cf1308a3f8b9bb12ed01aed1f6f6f8d (diff)
downloadQt-573be7e7ba19a2e826d17f5f78e272ee250831d0.zip
Qt-573be7e7ba19a2e826d17f5f78e272ee250831d0.tar.gz
Qt-573be7e7ba19a2e826d17f5f78e272ee250831d0.tar.bz2
doc: Second attempt to begin reorganizing the top doc page.
This change actually changes the left panels. Much more to come.
Diffstat (limited to 'tools')
-rw-r--r--tools/qdoc3/htmlgenerator.cpp3
-rw-r--r--tools/qdoc3/test/qt-html-templates.qdocconf27
2 files changed, 14 insertions, 16 deletions
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 373fa3d..dfba368 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -1243,6 +1243,8 @@ void HtmlGenerator::generateClassLikeNode(const InnerNode *inner,
subtitleText << "(" << Atom(Atom::AutoLink, fullTitle) << ")"
<< Atom(Atom::LineBreak);
+#if 0
+ // No longer used because the modeule name is a breadcrumb.
QString fixedModule = inner->moduleName();
if (fixedModule == "Qt3SupportLight")
fixedModule = "Qt3Support";
@@ -1263,6 +1265,7 @@ void HtmlGenerator::generateClassLikeNode(const InnerNode *inner,
subtitleText << "]";
}
}
+#endif
generateHeader(title, inner, marker);
sections = marker->sections(inner, CodeMarker::Summary, CodeMarker::Okay);
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index 1450149..8b007db 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -42,11 +42,12 @@ HTML.postheader = " <div class=\"header\" id=\"qtdocheader\">\n" \
" API Lookup</h2>\n" \
" <div id=\"list001\" class=\"list\">\n" \
" <ul id=\"ul001\" >\n" \
- " <li class=\"defaultLink\"><a href=\"modules.html\">All modules</a></li>\n" \
- " <li class=\"defaultLink\"><a href=\"classes.html\">All classes</a></li>\n" \
- " <li class=\"defaultLink\"><a href=\"functions.html\">All functions</a></li>\n" \
- " <li class=\"defaultLink\"><a href=\"namespaces.html\">All namespaces</a></li>\n" \
- " <li class=\"defaultLink\"><a href=\"platform-specific.html\">Platform specifics</a></li>\n" \
+ " <li class=\"defaultLink\"><a href=\"classes.html\">Class index</a></li>\n" \
+ " <li class=\"defaultLink\"><a href=\"functions.html\">Function index</a></li>\n" \
+ " <li class=\"defaultLink\"><a href=\"modules.html\">Module list</a></li>\n" \
+ " <li class=\"defaultLink\"><a href=\"namespaces.html\">Namespaces</a></li>\n" \
+ " <li class=\"defaultLink\"><a href=\"qtglobal.html\">Global stuff</a></li>\n" \
+ " <li class=\"defaultLink\"><a href=\"qdeclarativeelements.html\">QML table of elements</a></li>\n" \
" </ul> \n" \
" </div>\n" \
" <div id=\"live001\" class=\"live\">\n" \
@@ -54,20 +55,14 @@ HTML.postheader = " <div class=\"header\" id=\"qtdocheader\">\n" \
" </div>\n" \
" <div class=\"box bottombar\" id=\"topics\">\n" \
" <h2><span></span>\n" \
- " API Topics</h2>\n" \
+ " Qt Topics</h2>\n" \
" <div id=\"list002\" class=\"list\">\n" \
" <ul id=\"ul002\" >\n" \
- " <li class=\"defaultLink\"><a href=\"object.html\">QObject model</a></li>\n" \
- " <li class=\"defaultLink\"><a href=\"signalsandslots.html\">Signals &amp; Slots</a></li>\n" \
- " <li class=\"defaultLink\"><a href=\"eventsandfilters.html\">Event handling</a></li>\n" \
+ " <li class=\"defaultLink\"><a href=\"qt-basic-concepts.html\">Basic Concepts</a></li>\n" \
+ " <li class=\"defaultLink\"><a href=\"qt-graphics.html\">Painting & Graphics</a></li>\n" \
+ " <li class=\"defaultLink\"><a href=\"qt-gui-concepts.html\">GUI Components</a></li>\n" \
" <li class=\"defaultLink\"><a href=\"declarativeui.html\">Qt Quick</a></li>\n" \
- " <li class=\"defaultLink\"><a href=\"mainwindow.html\">The main window</a></li>\n" \
- " <li class=\"defaultLink\"><a href=\"widgets-and-layouts.html\">Widgets &amp; Layouts</a></li>\n" \
- " <li class=\"defaultLink\"><a href=\"dialogs.html\">Dialog windows</a></li>\n" \
- " <li class=\"defaultLink\"><a href=\"paintsystem.html\">The paint system</a></li>\n" \
- " <li class=\"defaultLink\"><a href=\"graphicsview.html\">Graphics views</a></li>\n" \
- " <li class=\"defaultLink\"><a href=\"model-view-programming.html\">Model&#47;View programming</a></li>\n" \
- " <li class=\"defaultLink\"><a href=\"widgets-and-layouts.html\">Widget style &amp; layout</a></li>\n" \
+ " <li class=\"defaultLink\"><a href=\"platform-specific.html\">Platform specifics</a></li>\n" \
" </ul> \n" \
" </div>\n" \
" <div id=\"live002\" class=\"live\">\n" \