From c152b5dc859a47c45c7be70b7869e747ec58d8a9 Mon Sep 17 00:00:00 2001 From: Morten Engvoldsen Date: Thu, 20 May 2010 10:04:58 +0200 Subject: Doc: Updating CSS and JS Fixed bugs on index page, moved JS from template to script file. --- tools/qdoc3/test/qt-html-templates.qdocconf | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'tools') diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf index e83e666422..50bf0c3fb4 100644 --- a/tools/qdoc3/test/qt-html-templates.qdocconf +++ b/tools/qdoc3/test/qt-html-templates.qdocconf @@ -109,7 +109,7 @@ HTML.postpostheader = " \n" \ "
\n" HTML.footer = " \n" \ - "
\n" \ + "
\n" \ " [+] Documentation Feedback
\n" \ "
\n" \ "
\n" \ @@ -127,14 +127,12 @@ HTML.footer = " \n" \ " href=\"http://qt.nokia.com/about/privacy-policy\">Privacy Policy

\n" \ " \n" \ "
\n" \ - "
\n" \ - " X\n" \ - "
\n" \ - "
\n" \ + "
X
\n" \ + " \n" \ "

\n" \ - " \n" \ - "

\n" \ + " \n" \ + " \n" \ + "

\n" \ "
\n" \ "
\n" \ "
\n" \ -- cgit v1.2.1 From be9d25dc7f06ce8d7a9bb7524bb9b11609c9ec90 Mon Sep 17 00:00:00 2001 From: David Boddie Date: Thu, 20 May 2010 18:46:39 +0200 Subject: qdoc: Propagate the language information into the XML as before. Reviewed-by: Trust Me --- tools/qdoc3/htmlgenerator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index e352364b79..27748336d3 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -1781,7 +1781,7 @@ void HtmlGenerator::generateHeader(const QString& title, { out() << QString("\n").arg(outputEncoding); out() << "\n"; - out() << "\n"; + out() << QString("\n").arg(naturalLanguage); out() << "\n"; out() << " \n"; QString shortVersion; -- cgit v1.2.1 From a8350d70e75462770e6ccb7a29c1c383c103687a Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 20 May 2010 11:52:59 +0200 Subject: use qtPrepareTool for qdoc Reviewed-by: joerg --- tools/qdoc3/qdoc3.pro | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'tools') diff --git a/tools/qdoc3/qdoc3.pro b/tools/qdoc3/qdoc3.pro index e394799380..81ff93a539 100644 --- a/tools/qdoc3/qdoc3.pro +++ b/tools/qdoc3/qdoc3.pro @@ -115,20 +115,7 @@ SOURCES += apigenerator.cpp \ ### Documentation for qdoc3 ### -win32:!win32-g++ { - unixstyle = false -} else :win32-g++:isEmpty(QMAKE_SH) { - unixstyle = false -} else { - unixstyle = true -} - -$$unixstyle { - QDOC = cd $$PWD/doc && $$[QT_INSTALL_BINS]/qdoc3 -} else { - QDOC = cd $$PWD/doc && $$[QT_INSTALL_BINS]/qdoc3.exe - QDOC = $$replace(QDOC, "/", "\\") -} +qtPrepareTool(QDOC, qdoc3) docs.commands = $$QDOC qdoc-manual.qdocconf -- cgit v1.2.1 From d53b25d397e54551aff15b79e3807e7ce4612886 Mon Sep 17 00:00:00 2001 From: Morten Engvoldsen Date: Fri, 21 May 2010 09:55:14 +0200 Subject: Doc: Changes to the HTMLGenerator, style and js Replacing tables with lists in the HTML generator Adding img to search box Moving JS from template to script files --- tools/qdoc3/htmlgenerator.cpp | 20 ++++++++++---------- tools/qdoc3/test/assistant.qdocconf | 1 + tools/qdoc3/test/designer.qdocconf | 1 + tools/qdoc3/test/linguist.qdocconf | 1 + tools/qdoc3/test/qdeclarative.qdocconf | 1 + tools/qdoc3/test/qmake.qdocconf | 1 + tools/qdoc3/test/qt-build-docs.qdocconf | 1 + tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf | 1 + tools/qdoc3/test/qt-defines.qdocconf | 1 + tools/qdoc3/test/qt-html-templates.qdocconf | 1 - tools/qdoc3/test/qt.qdocconf | 1 + tools/qdoc3/test/qt_zh_CN.qdocconf | 1 + 12 files changed, 20 insertions(+), 11 deletions(-) (limited to 'tools') diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index 6394b6e7fe..0e8d021287 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -2479,19 +2479,19 @@ void HtmlGenerator::generateCompactList(const Node *relative, out() << "

\n"; } - out() << "\n"; + out() << "
\n"; for (k = 0; k < numRows; k++) { if (++numTableRows % 2 == 1) - out() << "
"; + out() << "
"; + out() << "
"; //break; // out() << "
\n"; for (i = 0; i < NumColumns; i++) { if (currentOffset[i] >= firstOffset[i + 1]) { // this column is finished - out() << "\n"; // check why? + out() << "
\n
\n"; // check why? } else { while ((currentParagraphNo[i] < NumParagraphs) && @@ -2506,7 +2506,7 @@ void HtmlGenerator::generateCompactList(const Node *relative, currentParagraphNo[i] = NumParagraphs - 1; } #endif - out() << "\n"; + out() << "

\n"; - out() << "\n"; + out() << "

\n"; currentOffset[i]++; currentOffsetInParagraph[i]++; } } - out() << "\n"; + out() << "\n"; } - out() << "
\n

"; + out() << "

"; if (currentOffsetInParagraph[i] == 0) { // start a new paragraph if (includeAlphabet) { @@ -2517,9 +2517,9 @@ void HtmlGenerator::generateCompactList(const Node *relative, << paragraphName[currentParagraphNo[i]] << ""; } - out() << "

"; + out() << "

"; if ((currentParagraphNo[i] < NumParagraphs) && !paragraphName[currentParagraphNo[i]].isEmpty()) { NodeMap::Iterator it; @@ -2545,15 +2545,15 @@ void HtmlGenerator::generateCompactList(const Node *relative, out() << ")"; } } - out() << "

\n"; + out() << "
\n"; } void HtmlGenerator::generateFunctionIndex(const Node *relative, diff --git a/tools/qdoc3/test/assistant.qdocconf b/tools/qdoc3/test/assistant.qdocconf index 3711ec4e40..167bb197c7 100644 --- a/tools/qdoc3/test/assistant.qdocconf +++ b/tools/qdoc3/test/assistant.qdocconf @@ -30,6 +30,7 @@ qhp.Assistant.extraFiles = images/bg_l.png \ images/page.png \ images/page_bg.png \ images/sprites-combined.png \ + images/spinner.gif \ images/stylesheet-coffee-plastique.png \ images/taskmenuextension-example.png \ images/coloreditorfactoryimage.png \ diff --git a/tools/qdoc3/test/designer.qdocconf b/tools/qdoc3/test/designer.qdocconf index 39da68b0c0..48e3ea12e7 100644 --- a/tools/qdoc3/test/designer.qdocconf +++ b/tools/qdoc3/test/designer.qdocconf @@ -30,6 +30,7 @@ qhp.Designer.extraFiles = images/bg_l.png \ images/page.png \ images/page_bg.png \ images/sprites-combined.png \ + images/spinner.gif \ images/stylesheet-coffee-plastique.png \ images/taskmenuextension-example.png \ images/coloreditorfactoryimage.png \ diff --git a/tools/qdoc3/test/linguist.qdocconf b/tools/qdoc3/test/linguist.qdocconf index dba4fb5f43..8974bd7143 100644 --- a/tools/qdoc3/test/linguist.qdocconf +++ b/tools/qdoc3/test/linguist.qdocconf @@ -30,6 +30,7 @@ qhp.Linguist.extraFiles = images/bg_l.png \ images/page.png \ images/page_bg.png \ images/sprites-combined.png \ + images/spinner.gif \ images/stylesheet-coffee-plastique.png \ images/taskmenuextension-example.png \ images/coloreditorfactoryimage.png \ diff --git a/tools/qdoc3/test/qdeclarative.qdocconf b/tools/qdoc3/test/qdeclarative.qdocconf index f744879824..0f2e3815b9 100644 --- a/tools/qdoc3/test/qdeclarative.qdocconf +++ b/tools/qdoc3/test/qdeclarative.qdocconf @@ -41,6 +41,7 @@ qhp.Qml.extraFiles = images/bg_l.png \ images/page.png \ images/page_bg.png \ images/sprites-combined.png \ + images/spinner.png \ images/stylesheet-coffee-plastique.png \ images/taskmenuextension-example.png \ images/coloreditorfactoryimage.png \ diff --git a/tools/qdoc3/test/qmake.qdocconf b/tools/qdoc3/test/qmake.qdocconf index b7f411515a..ea58059172 100644 --- a/tools/qdoc3/test/qmake.qdocconf +++ b/tools/qdoc3/test/qmake.qdocconf @@ -30,6 +30,7 @@ qhp.qmake.extraFiles = images/bg_l.png \ images/page.png \ images/page_bg.png \ images/sprites-combined.png \ + images/spinner.gif \ images/stylesheet-coffee-plastique.png \ images/taskmenuextension-example.png \ images/coloreditorfactoryimage.png \ diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf index d3c855f1cf..bd363a626d 100644 --- a/tools/qdoc3/test/qt-build-docs.qdocconf +++ b/tools/qdoc3/test/qt-build-docs.qdocconf @@ -36,6 +36,7 @@ qhp.Qt.extraFiles = index.html \ images/page.png \ images/page_bg.png \ images/sprites-combined.png \ + images/spinner.gif \ images/stylesheet-coffee-plastique.png \ images/taskmenuextension-example.png \ images/coloreditorfactoryimage.png \ diff --git a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf index e9bc00cbf6..caf5f73cee 100644 --- a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf +++ b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf @@ -44,6 +44,7 @@ qhp.Qt.extraFiles = index.html \ images/page.png \ images/page_bg.png \ images/sprites-combined.png \ + images/spinner.gif \ images/stylesheet-coffee-plastique.png \ images/taskmenuextension-example.png \ images/coloreditorfactoryimage.png \ diff --git a/tools/qdoc3/test/qt-defines.qdocconf b/tools/qdoc3/test/qt-defines.qdocconf index f3291dfb95..3e71d07766 100644 --- a/tools/qdoc3/test/qt-defines.qdocconf +++ b/tools/qdoc3/test/qt-defines.qdocconf @@ -34,6 +34,7 @@ extraimages.HTML = qt-logo \ page.png \ page_bg.png \ sprites-combined.png \ + spinner.gif \ taskmenuextension-example.png \ coloreditorfactoryimage.png \ dynamiclayouts-example.png \ diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf index 50bf0c3fb4..09f0c96c5a 100644 --- a/tools/qdoc3/test/qt-html-templates.qdocconf +++ b/tools/qdoc3/test/qt-html-templates.qdocconf @@ -130,7 +130,6 @@ HTML.footer = " \n" \ "
X
\n" \ "
\n" \ "

\n" \ - " \n" \ " \n" \ "

\n" \ "
\n" \ diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf index 83a35a9aa8..267d536c1e 100644 --- a/tools/qdoc3/test/qt.qdocconf +++ b/tools/qdoc3/test/qt.qdocconf @@ -40,6 +40,7 @@ qhp.Qt.extraFiles = index.html \ images/page.png \ images/page_bg.png \ images/sprites-combined.png \ + images/spinner.gif \ images/stylesheet-coffee-plastique.png \ images/taskmenuextension-example.png \ images/coloreditorfactoryimage.png \ diff --git a/tools/qdoc3/test/qt_zh_CN.qdocconf b/tools/qdoc3/test/qt_zh_CN.qdocconf index 9275b5c1c2..db02478595 100644 --- a/tools/qdoc3/test/qt_zh_CN.qdocconf +++ b/tools/qdoc3/test/qt_zh_CN.qdocconf @@ -46,6 +46,7 @@ qhp.Qt.extraFiles = index.html \ images/page.png \ images/page_bg.png \ images/sprites-combined.png \ + images/spinner.gif \ images/stylesheet-coffee-plastique.png \ images/taskmenuextension-example.png \ images/coloreditorfactoryimage.png \ -- cgit v1.2.1 From 9ad82755f62b7fb5e303bf5f8ee2bb8e4afb7f8d Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Fri, 21 May 2010 10:34:42 +0200 Subject: qdoc: Changed number of columns to 1. Oila! --- tools/qdoc3/htmlgenerator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index 0e8d021287..1872d87d72 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -2332,7 +2332,7 @@ void HtmlGenerator::generateCompactList(const Node *relative, QString commonPrefix) { const int NumParagraphs = 37; // '0' to '9', 'A' to 'Z', '_' - const int NumColumns = 3; // number of columns in the result + const int NumColumns = 1; // number of columns in the result if (classMap.isEmpty()) return; -- cgit v1.2.1 From 04ad0950378fb4255064c10d5a4d64c1074035ed Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Fri, 21 May 2010 10:53:55 +0200 Subject: qdoc: Fixed html error, but the problem is still there. --- tools/qdoc3/htmlgenerator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index 1872d87d72..cf8ea7c8c6 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -2482,7 +2482,7 @@ void HtmlGenerator::generateCompactList(const Node *relative, out() << "
\n"; for (k = 0; k < numRows; k++) { if (++numTableRows % 2 == 1) - out() << "
"; else out() << "
"; //break; -- cgit v1.2.1 From 6b52b41c71300ea3424385986391485058fc1fa5 Mon Sep 17 00:00:00 2001 From: Morten Engvoldsen Date: Fri, 21 May 2010 13:29:58 +0200 Subject: Doc: design changes Fixing menus and js --- tools/qdoc3/test/qt-html-templates.qdocconf | 7 ------- 1 file changed, 7 deletions(-) (limited to 'tools') diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf index 09f0c96c5a..b72a1eb96e 100644 --- a/tools/qdoc3/test/qt-html-templates.qdocconf +++ b/tools/qdoc3/test/qt-html-templates.qdocconf @@ -54,8 +54,6 @@ HTML.postheader = "
\n" \ "
  • QML elements
    • \n" \ " \n" \ "
    \n" \ - "
    \n" \ - "
    \n" \ "
    \n" \ "
    \n" \ "

    \n" \ @@ -68,8 +66,6 @@ HTML.postheader = "
    \n" \ "
  • Platform-specific info
    • \n" \ " \n" \ "
    \n" \ - "
    \n" \ - "
    \n" \ "

    \n" \ "
    \n" \ "

    \n" \ @@ -83,8 +79,6 @@ HTML.postheader = "
    \n" \ "
  • QML Demos
    • \n" \ " \n" \ "
    \n" \ - "
    \n" \ - "
    \n" \ "

    \n" \ " \n" \ "
    \n" \ @@ -130,7 +124,6 @@ HTML.footer = " \n" \ "
    X
    \n" \ "
    \n" \ "

    \n" \ - " \n" \ "

    \n" \ "
    \n" \ "
    \n" \ -- cgit v1.2.1