Doc: adding offline docs to assistant and Qt Creator. Improving small docs and adding highlighting

10 files changed, 110 insertions, 30 deletions

diff --git a/tools/qdoc3/test/assistant.qdocconf b/tools/qdoc3/test/assistant.qdocconf
index 167bb19..4b52992 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/arrow-down.png \
 									images/spinner.gif \
                              	    images/stylesheet-coffee-plastique.png \
                              	    images/taskmenuextension-example.png \
@@ -37,6 +38,7 @@ qhp.Assistant.extraFiles          = 									images/bg_l.png \
                              	   images/dynamiclayouts-example.png \
 									scripts/functions.js \
 									scripts/jquery.js \
+									style/OfflineStyle.css \
 									style/style_ie6.css \
 									style/style_ie7.css \
 									style/style_ie8.css \
diff --git a/tools/qdoc3/test/designer.qdocconf b/tools/qdoc3/test/designer.qdocconf
index 48e3ea1..b1f37dc 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/arrow-down.png \
 									images/spinner.gif \
                              	    images/stylesheet-coffee-plastique.png \
                              	    images/taskmenuextension-example.png \
@@ -37,6 +38,7 @@ qhp.Designer.extraFiles          = images/bg_l.png \
                              	   images/dynamiclayouts-example.png \
 									scripts/functions.js \
 									scripts/jquery.js \
+									style/OfflineStyle.css \
 									style/style_ie6.css \
 									style/style_ie7.css \
 									style/style_ie8.css \
diff --git a/tools/qdoc3/test/linguist.qdocconf b/tools/qdoc3/test/linguist.qdocconf
index 8974bd7..26fb55c 100644
--- a/tools/qdoc3/test/linguist.qdocconf
+++ b/tools/qdoc3/test/linguist.qdocconf
@@ -30,13 +30,15 @@ qhp.Linguist.extraFiles          = images/bg_l.png \
 									images/page.png \
 									images/page_bg.png \
 									images/sprites-combined.png \
-									images/spinner.gif \
+									images/arrow-down.png \
+s									images/spinner.gif \
                              	    images/stylesheet-coffee-plastique.png \
                              	    images/taskmenuextension-example.png \
                              	   images/coloreditorfactoryimage.png \
                              	   images/dynamiclayouts-example.png \
 									scripts/functions.js \
 									scripts/jquery.js \
+									style/OfflineStyle.css \
 									style/style_ie6.css \
 									style/style_ie7.css \
 									style/style_ie8.css \
diff --git a/tools/qdoc3/test/qdeclarative.qdocconf b/tools/qdoc3/test/qdeclarative.qdocconf
index 0f2e381..74fd802 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/arrow-down.png \
 									images/spinner.png \
                              	    images/stylesheet-coffee-plastique.png \
                              	    images/taskmenuextension-example.png \
@@ -48,6 +49,7 @@ qhp.Qml.extraFiles            = images/bg_l.png \
                              	   images/dynamiclayouts-example.png \
 									scripts/functions.js \
 									scripts/jquery.js \
+									style/OfflineStyle.css \
 									style/style_ie6.css \
 									style/style_ie7.css \
 									style/style_ie8.css \
diff --git a/tools/qdoc3/test/qmake.qdocconf b/tools/qdoc3/test/qmake.qdocconf
index ea58059..f069129 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/arrow-down.png \
 									images/spinner.gif \
                              	    images/stylesheet-coffee-plastique.png \
                              	    images/taskmenuextension-example.png \
@@ -37,6 +38,7 @@ qhp.qmake.extraFiles          = images/bg_l.png \
                              	   images/dynamiclayouts-example.png \
 									scripts/functions.js \
 									scripts/jquery.js \
+									style/OfflineStyle.css \
 									style/style_ie6.css \
 									style/style_ie7.css \
 									style/style_ie8.css \
diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf
index bd363a6..00704ea 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/arrow-down.png \
 									images/spinner.gif \
                              	    images/stylesheet-coffee-plastique.png \
                              	    images/taskmenuextension-example.png \
@@ -43,6 +44,7 @@ qhp.Qt.extraFiles          = index.html \
                              	   images/dynamiclayouts-example.png \
 									scripts/functions.js \
 									scripts/jquery.js \
+									style/OfflineStyle.css \
 								    style/style_ie6.css \
 									style/style_ie7.css \
 									style/style_ie8.css \
diff --git a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
index caf5f73..712e23f 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/arrow-down.png \
 									images/spinner.gif \
                              	    images/stylesheet-coffee-plastique.png \
                              	    images/taskmenuextension-example.png \
diff --git a/tools/qdoc3/test/qt-defines.qdocconf b/tools/qdoc3/test/qt-defines.qdocconf
index 3e71d07..9e41d93 100644
--- a/tools/qdoc3/test/qt-defines.qdocconf
+++ b/tools/qdoc3/test/qt-defines.qdocconf
@@ -20,34 +20,49 @@ codeindent              = 1
 # See also qhp.Qt.extraFiles
 extraimages.HTML        = qt-logo \
                           trolltech-logo \
-			  bg_l.png \
-                          bg_l_blank.png \
-                          bg_r.png \
-			  box_bg.png \
-			  breadcrumb.png \
-			  bullet_gt.png \
-                          bullet_dn.png \
-			  bullet_sq.png \
-                          bullet_up.png \
-                          feedbackground.png \
-                          horBar.png \
-			  page.png \
-			  page_bg.png \
-			  sprites-combined.png \
-			  spinner.gif \
-                          taskmenuextension-example.png \
-                          coloreditorfactoryimage.png \
-                          dynamiclayouts-example.png \
-                          stylesheet-coffee-plastique.png
+						 bg_l.png \
+						 bg_l_blank.png \
+						 bg_ll_blank.png \
+						 bg_ul_blank.png \
+						 header_bg.png \
+						 bg_r.png \
+						 box_bg.png \
+						 breadcrumb.png \
+						 bullet_gt.png \
+						 bullet_dn.png \
+						 bullet_sq.png \
+						 bullet_up.png \
+						 arrow_down.png \
+						 feedbackground.png \
+						 horBar.png \
+						 page.png \
+						 page_bg.png \
+						 sprites-combined.png \
+						 spinner.gif \
+						 stylesheet-coffee-plastique.png \
+						 taskmenuextension-example.png \
+						 coloreditorfactoryimage.png \
+						 dynamiclayouts-example.png \
 
 # This stuff is used by the new doc format.
 scriptdirs              = $QT_SOURCE_TREE/doc/src/template/scripts
 styledirs               = $QT_SOURCE_TREE/doc/src/template/style
 
 scripts.HTML		= functions.js \
+			     shBrushCpp.js \
+			     shCore.js \
+			     shLegacy.js \
+			     narrow.js \
+			     superfish.js \
 			  jquery.js
 
 styles.HTML		= style.css \
+			     shCore.css \
+			     shThemeDefault.css \
+			     narrow.css \
+			     superfish.css \
+			     superfish_skin.css \
+				 OfflineStyle.css \
 			  style_ie6.css \
 			  style_ie7.css \
 			  style_ie8.css
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index b72a1eb..60f5fb1 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -1,12 +1,19 @@
-HTML.stylesheets        =  style/style_ie6.css \
+HTML.stylesheets        =  style/style.css \
+									style/OfflineStyle.css \
 									style/style_ie7.css \
 									style/style_ie8.css \
-									style/style.css
+									style/style_ie6.css
 									
 HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
+			  "    <div class=\"content\"> \n" \
 			  "    <div id=\"nav-logo\">\n" \
 			  "      <a href=\"index.html\">Home</a></div>\n" \
 			  "    <a href=\"index.html\" class=\"qtref\"><span>Qt Reference Documentation</span></a>\n" \
+			  "		<div id=\"narrowsearch\"><form onsubmit=\"return false;\" action=\"\" id=\"qtdocsearch\">\n" \
+			  "		<fieldset>\n" \
+              "		<input type=\"text\" value=\"\" id=\"pageType\" name=\"searchstring\">\n" \
+			  "		 </fieldset>\n" \
+			  "		</form></div>\n" \
 			  "    <div id=\"nav-topright\">\n" \
 			  "      <ul>\n" \
 			  "        <li class=\"nav-topright-home\"><a href=\"http://qt.nokia.com/\">Qt HOME</a></li>\n" \
@@ -21,9 +28,39 @@ HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
 			  "    <div id=\"shortCut\">\n" \
 			  "      <ul>\n" \
 			  "        <li class=\"shortCut-topleft-inactive\"><span><a href=\"index.html\">Qt 4.7</a></span></li>\n" \
-			  "        <li class=\"shortCut-topleft-active\"><a href=\"http://qt.nokia.com/doc/\">ALL Qt VERSIONS" \
+			  "        <li class=\"shortCut-topleft-active\"><a href=\"http://qt.nokia.com/doc/\">ALL VERSIONS" \
 			  "        </a></li>\n" \
 			  "      </ul>\n" \
+			  "     </div>\n" \
+			 " <ul class=\"sf-menu sf-js-enabled sf-shadow\" id=\"narrowmenu\"> \n" \
+			"		 <li><a href=\"#\">API Lookup</a> \n" \
+			"			 <ul id=\"topmenuLook\"> \n" \
+			"			   <li><a href=\"classes.html\">Class index</a></li> \n" \
+			" 			  <li><a href=\"functions.html\">Function index</a></li> \n" \
+			"			   <li><a href=\"modules.html\">Modules</a></li> \n" \
+			"			   <li><a href=\"namespaces.html\">Namespaces</a></li> \n" \
+			"			   <li><a href=\"qtglobal.html\">Global stuff</a></li> \n" \
+			"			   <li><a href=\"qdeclarativeelements.html\">QML elements</a></li> \n" \
+			"			   </ul> \n" \
+			"		 </li> \n" \
+			"		 <li><a href=\"#\">Qt Topics</a> \n" \
+			"			 <ul id=\"topmenuTopic\"> \n" \
+			"			   <li><a href=\"qt-basic-concepts.html\">Basic Qt architecture</a></li> \n" \
+			"			   <li><a href=\"declarativeui.html\">Device UI's &amp; Qt Quick</a></li> \n" \
+			"			   <li><a href=\"qt-gui-concepts.html\">Desktop UI components</a></li> \n" \
+			"			   <li><a href=\"platform-specific.html\">Platform-specific info</a></li> \n" \
+			"			 </ul> \n" \
+			"		</li> \n" \
+			"		 <li><a href=\"#\">Examples</a> \n" \
+			"			 <ul id=\"topmenuexample\"> \n" \
+			"				 <li><a href=\"all-examples.html\">Examples</a></li> \n" \
+			"				 <li><a href=\"tutorials.html\">Tutorials</a></li> \n" \
+			"				 <li><a href=\"demos.html\">Demos</a></li> \n" \
+			"				 <li><a href=\"qdeclarativeexamples.html\">QML Examples</a></li> \n" \
+			"				 <li><a href=\"qdeclarativeexamples.html#Demos\">QML Demos</a></li> \n" \
+			"			 </ul> \n" \
+			"		 </li> \n" \
+			" </ul> \n" \
 			  "    </div>\n" \
 			  "  </div>\n" \
 			  "  <div class=\"wrapper\">\n" \
@@ -35,14 +72,14 @@ HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
 			  "        <div class=\"searchlabel\">\n" \
 			  "          Search index:</div>\n" \
 			  "        <div class=\"search\">\n" \
-			  "          <form id=\"qtdocsearch\" action=\"\">\n" \
+			  "          <form id=\"qtdocsearch\" action=\"\" onsubmit=\"return false;\">\n" \
 			  "            <fieldset>\n" \
 			  "              <input type=\"text\" name=\"searchstring\" id=\"pageType\" value=\"\" />\n" \
 			  "            </fieldset>\n" \
 			  "          </form>\n" \
 			  "        </div>\n" \
 			  "        <div class=\"box first bottombar\" id=\"lookup\">\n" \
-			  "          <h2><span></span>\n" \
+			  "          <h2 title=\"API Lookup\"><span></span>\n" \
 			  "            API Lookup</h2>\n" \
 			  "          <div  id=\"list001\" class=\"list\">\n" \
 			  "          <ul id=\"ul001\" >\n" \
@@ -56,7 +93,7 @@ HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
 			  "          </div>\n" \
 			  "        </div>\n" \
 			  "        <div class=\"box bottombar\" id=\"topics\">\n" \
-			  "          <h2><span></span>\n" \
+			  "          <h2 title=\"Qt Topics\"><span></span>\n" \
 			  "            Qt Topics</h2>\n" \
 			  "          <div id=\"list002\" class=\"list\">\n" \
 			  "            <ul id=\"ul002\" >\n" \
@@ -68,7 +105,7 @@ HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
 			  "          </div>\n" \
 			  "        </div>\n" \
 			  "        <div class=\"box\" id=\"examples\">\n" \
-			  "          <h2><span></span>\n" \
+			  "          <h2 title=\"Examples\"><span></span>\n" \
 			  "            Examples</h2>\n" \
 			  "          <div id=\"list003\" class=\"list\">\n" \
 			  "        <ul id=\"ul003\">\n" \
@@ -129,7 +166,7 @@ HTML.footer             = "        <!-- /div -->\n" \
 			  "  </div>\n" \
 			  "  <div id=\"blurpage\">\n" \
 			  "  </div>\n" \
-			  "<!-- <script type=\"text/javascript\">\n" \
+			  "<script type=\"text/javascript\">\n" \
 			  "  var _gaq = _gaq || [];\n" \
 			  "  _gaq.push([\'_setAccount\', \'UA-4457116-5\']);\n" \
 			  "  _gaq.push([\'_trackPageview\']);\n" \
@@ -138,4 +175,4 @@ HTML.footer             = "        <!-- /div -->\n" \
 			  "    ga.src = (\'https:\' == document.location.protocol ? \'https://ssl\' : \'http://www\') + \'.google-analytics.com/ga.js\';\n" \
 			  "    var s = document.getElementsByTagName(\'script\')[0]; s.parentNode.insertBefore(ga, s);\n" \
 			  "  })();\n" \
-			  "</script> -->\n"
+			  "</script>\n"
diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf
index 267d536..edf6d92 100644
--- a/tools/qdoc3/test/qt.qdocconf
+++ b/tools/qdoc3/test/qt.qdocconf
@@ -28,13 +28,17 @@ qhp.Qt.indexRoot           =
 qhp.Qt.extraFiles          = index.html \
 			     images/bg_l.png \
 			     images/bg_l_blank.png \
-                             images/bg_r.png \
+			     images/bg_ll_blank.png \
+			     images/bg_ul_blank.png \
+			     images/header_bg.png \
+                 images/bg_r.png \
 			     images/box_bg.png \
 			     images/breadcrumb.png \
 			     images/bullet_gt.png \
 			     images/bullet_dn.png \
 			     images/bullet_sq.png \
 			     images/bullet_up.png \
+			     images/arrow_down.png \
 			     images/feedbackground.png \
 			     images/horBar.png \
 			     images/page.png \
@@ -47,6 +51,17 @@ qhp.Qt.extraFiles          = index.html \
 			     images/dynamiclayouts-example.png \
 			     scripts/functions.js \
 			     scripts/jquery.js \
+			     scripts/shBrushCpp.js \
+			     scripts/shCore.js \
+			     scripts/shLegacy.js \
+			     scripts/narrow.js \
+			     scripts/superfish.js \
+			     style/shCore.css \
+			     style/shThemeDefault.css \
+			     style/narrow.css \
+			     style/superfish.css \
+			     style/superfish_skin.css \
+  				style/OfflineStyle.css \
 			     style/style_ie6.css \
 			     style/style_ie7.css \
 			     style/style_ie8.css \