From 573be7e7ba19a2e826d17f5f78e272ee250831d0 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Thu, 6 May 2010 14:48:05 +0200 Subject: doc: Second attempt to begin reorganizing the top doc page. This change actually changes the left panels. Much more to come. --- doc/src/frameworks-technologies/graphicsview.qdoc | 2 +- doc/src/overviews.qdoc | 13 +++++++++-- doc/src/painting-and-printing/coordsys.qdoc | 1 + doc/src/painting-and-printing/paintsystem.qdoc | 2 +- tools/qdoc3/htmlgenerator.cpp | 3 +++ tools/qdoc3/test/qt-html-templates.qdocconf | 27 +++++++++-------------- 6 files changed, 28 insertions(+), 20 deletions(-) diff --git a/doc/src/frameworks-technologies/graphicsview.qdoc b/doc/src/frameworks-technologies/graphicsview.qdoc index 95b3182..740fcac 100644 --- a/doc/src/frameworks-technologies/graphicsview.qdoc +++ b/doc/src/frameworks-technologies/graphicsview.qdoc @@ -47,7 +47,7 @@ /*! \page graphicsview.html \title The Graphics View Framework - \ingroup qt-gui-concepts + \ingroup qt-graphics \brief An overview of the Graphics View framework for interactive 2D graphics. diff --git a/doc/src/overviews.qdoc b/doc/src/overviews.qdoc index bc994af..b2ba3a1 100644 --- a/doc/src/overviews.qdoc +++ b/doc/src/overviews.qdoc @@ -63,9 +63,18 @@ /*! \group qt-gui-concepts - \title Qt GUI Components + \title Qt GUI Construction - \brief The Qt components for constructing graphical user intefaces. + \brief The Qt components for constructing Graphical User Intefaces. + + \generatelist {related} + */ + +/*! + \group qt-graphics + \title Qt Graphics + + \brief The Qt components for doing graphics. \generatelist {related} */ diff --git a/doc/src/painting-and-printing/coordsys.qdoc b/doc/src/painting-and-printing/coordsys.qdoc index 5807f57..b0ba093 100644 --- a/doc/src/painting-and-printing/coordsys.qdoc +++ b/doc/src/painting-and-printing/coordsys.qdoc @@ -42,6 +42,7 @@ /*! \page coordsys.html \title The Coordinate System + \ingroup qt-graphics \brief Information about the coordinate system used by the paint system. diff --git a/doc/src/painting-and-printing/paintsystem.qdoc b/doc/src/painting-and-printing/paintsystem.qdoc index 56b638c..b711b2f 100644 --- a/doc/src/painting-and-printing/paintsystem.qdoc +++ b/doc/src/painting-and-printing/paintsystem.qdoc @@ -61,7 +61,7 @@ /*! \page paintsystem.html \title The Paint System - \ingroup qt-gui-concepts + \ingroup qt-graphics \ingroup frameworks-technologies Qt's paint system enables painting on screen and print devices 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 = "
\n" \ " API Lookup\n" \ "
\n" \ " \n" \ "
\n" \ "
\n" \ @@ -54,20 +55,14 @@ HTML.postheader = "
\n" \ "
\n" \ "
\n" \ "

\n" \ - " API Topics

\n" \ + " Qt Topics\n" \ "
\n" \ " \n" \ "
\n" \ "
\n" \ -- cgit v0.12