From d755baa8aac55cae829c04693ce0b52360b06938 Mon Sep 17 00:00:00 2001 From: Morten Engvoldsen Date: Tue, 4 May 2010 14:14:44 +0200 Subject: Doc: A number of fixes and updates for the new design. See details index.qdoc updated the HTML to use sprites images - deleted obsolete images from templates/images images - added new images to templates/images styles.css - updated styles to handle index, sprites and templates correct. assistant.qdoconf - updates images designer.qdoconf - updates images linguist.qdoconf - updates images declarative.qdoconf - updates images qmake.qdoconf - updates images qt-build-docs.qdoconf - updates images qt-build-docs_zh_CN.qdoconf - updates images qt-defines.qdoconf - updates images qt.qdoconf - updates images qt_zh_CN.qdoconf - updates images qt-htmlTemplates.qdoconf - updated template to use sprites declarativeui.qdoc - removed
Reviewed-by: Trust Me --- doc/src/declarative/declarativeui.qdoc | 4 - doc/src/index.qdoc | 29 +- doc/src/template/images/api_examples.png | Bin 1302 -> 0 bytes doc/src/template/images/api_lookup.png | Bin 1879 -> 0 bytes doc/src/template/images/api_topics.png | Bin 1216 -> 0 bytes doc/src/template/images/bg_l.png | Bin 139 -> 100 bytes doc/src/template/images/bg_l_blank.png | Bin 123 -> 84 bytes doc/src/template/images/bg_ll.png | Bin 514 -> 0 bytes doc/src/template/images/bg_ll_blank.png | Bin 320 -> 0 bytes doc/src/template/images/bg_lr.png | Bin 458 -> 0 bytes doc/src/template/images/bg_r.png | Bin 136 -> 96 bytes doc/src/template/images/bg_ul.png | Bin 516 -> 0 bytes doc/src/template/images/bg_ul_blank.png | Bin 304 -> 0 bytes doc/src/template/images/bg_ur.png | Bin 437 -> 0 bytes doc/src/template/images/bg_ur_blank.png | Bin 437 -> 0 bytes doc/src/template/images/box_bg.png | Bin 129 -> 89 bytes doc/src/template/images/breadcrumb.png | Bin 195 -> 134 bytes doc/src/template/images/bullet_gt.png | Bin 185 -> 124 bytes doc/src/template/images/bullet_sq.png | Bin 117 -> 74 bytes doc/src/template/images/content_bg.png | Bin 1498 -> 0 bytes doc/src/template/images/form_bg.png | Bin 390 -> 0 bytes doc/src/template/images/header.png | Bin 2600 -> 0 bytes doc/src/template/images/page_bg.png | Bin 126 -> 84 bytes doc/src/template/images/print.png | Bin 575 -> 0 bytes doc/src/template/images/qt_guide.png | Bin 12685 -> 0 bytes doc/src/template/images/qt_icon.png | Bin 4775 -> 0 bytes doc/src/template/images/qt_ref_doc.png | Bin 2600 -> 0 bytes doc/src/template/images/qt_tools.png | Bin 17508 -> 0 bytes doc/src/template/images/sep.png | Bin 120 -> 0 bytes doc/src/template/scripts/functions.js | 272 ++++++++- doc/src/template/style/style.css | 115 ++-- tools/qdoc3/htmlgenerator.cpp | 73 ++- tools/qdoc3/test/assistant.qdocconf | 43 +- tools/qdoc3/test/designer.qdocconf | 57 +- tools/qdoc3/test/linguist.qdocconf | 57 +- tools/qdoc3/test/qdeclarative.qdocconf | 60 +- tools/qdoc3/test/qmake.qdocconf | 61 +- tools/qdoc3/test/qt-build-docs.qdocconf | 60 +- tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf | 60 +- tools/qdoc3/test/qt-defines.qdocconf | 45 +- tools/qdoc3/test/qt-html-templates.qdocconf | 60 +- tools/qdoc3/test/qt.qdocconf | 60 +- tools/qdoc3/test/qt_zh_CN.qdocconf | 60 +- tools/qdoc3/test/style/style.css | 797 +++++++++++++++----------- 44 files changed, 1021 insertions(+), 892 deletions(-) delete mode 100755 doc/src/template/images/api_examples.png delete mode 100755 doc/src/template/images/api_lookup.png delete mode 100755 doc/src/template/images/api_topics.png delete mode 100755 doc/src/template/images/bg_ll.png delete mode 100755 doc/src/template/images/bg_ll_blank.png delete mode 100755 doc/src/template/images/bg_lr.png delete mode 100755 doc/src/template/images/bg_ul.png delete mode 100755 doc/src/template/images/bg_ul_blank.png delete mode 100755 doc/src/template/images/bg_ur.png delete mode 100755 doc/src/template/images/bg_ur_blank.png delete mode 100755 doc/src/template/images/content_bg.png delete mode 100755 doc/src/template/images/form_bg.png delete mode 100644 doc/src/template/images/header.png delete mode 100755 doc/src/template/images/print.png delete mode 100755 doc/src/template/images/qt_guide.png delete mode 100755 doc/src/template/images/qt_icon.png delete mode 100755 doc/src/template/images/qt_ref_doc.png delete mode 100755 doc/src/template/images/qt_tools.png delete mode 100755 doc/src/template/images/sep.png diff --git a/doc/src/declarative/declarativeui.qdoc b/doc/src/declarative/declarativeui.qdoc index d79c4d2..9728abb 100644 --- a/doc/src/declarative/declarativeui.qdoc +++ b/doc/src/declarative/declarativeui.qdoc @@ -48,10 +48,6 @@ highly dynamic, custom user interfaces. \section1 \l{QML Elements}{Fast QML Elements Reference Page} -\raw HTML -
-\endraw - \section1 Preamble Qt Declarative UI provides a declarative framework for building highly dynamic, custom diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index 6047e91..92f91e6 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -44,16 +44,15 @@ \keyword Qt Reference Documentation \raw HTML -
+
Qt Developer Guide
-
-
+

Qt is a cross-platform application and UI framework. Using Qt, you can write web-enabled applications once and deploy them across desktop, mobile and embedded operating systems without rewriting the source code.

-
+
-
+
Qt API Overviews
-
-
+
+
-
+
-
+
-
+
Qt Tools
-
-
+

Qt offers a selection of development tools for different tasks. Use Qt Creator for project and code management as well as building powerfull UIs.

-
+
-
-
- +
+
\endraw */ diff --git a/doc/src/template/images/api_examples.png b/doc/src/template/images/api_examples.png deleted file mode 100755 index 1fcbc96..0000000 Binary files a/doc/src/template/images/api_examples.png and /dev/null differ diff --git a/doc/src/template/images/api_lookup.png b/doc/src/template/images/api_lookup.png deleted file mode 100755 index 1cffd5e..0000000 Binary files a/doc/src/template/images/api_lookup.png and /dev/null differ diff --git a/doc/src/template/images/api_topics.png b/doc/src/template/images/api_topics.png deleted file mode 100755 index a76a6c3..0000000 Binary files a/doc/src/template/images/api_topics.png and /dev/null differ diff --git a/doc/src/template/images/bg_l.png b/doc/src/template/images/bg_l.png index 95470c7..90b1da1 100755 Binary files a/doc/src/template/images/bg_l.png and b/doc/src/template/images/bg_l.png differ diff --git a/doc/src/template/images/bg_l_blank.png b/doc/src/template/images/bg_l_blank.png index e0eca3f..5a9673d 100755 Binary files a/doc/src/template/images/bg_l_blank.png and b/doc/src/template/images/bg_l_blank.png differ diff --git a/doc/src/template/images/bg_ll.png b/doc/src/template/images/bg_ll.png deleted file mode 100755 index 99796e7..0000000 Binary files a/doc/src/template/images/bg_ll.png and /dev/null differ diff --git a/doc/src/template/images/bg_ll_blank.png b/doc/src/template/images/bg_ll_blank.png deleted file mode 100755 index 95a1c45..0000000 Binary files a/doc/src/template/images/bg_ll_blank.png and /dev/null differ diff --git a/doc/src/template/images/bg_lr.png b/doc/src/template/images/bg_lr.png deleted file mode 100755 index fef1d17..0000000 Binary files a/doc/src/template/images/bg_lr.png and /dev/null differ diff --git a/doc/src/template/images/bg_r.png b/doc/src/template/images/bg_r.png index 42a35a5..f0fb121 100755 Binary files a/doc/src/template/images/bg_r.png and b/doc/src/template/images/bg_r.png differ diff --git a/doc/src/template/images/bg_ul.png b/doc/src/template/images/bg_ul.png deleted file mode 100755 index 303181f..0000000 Binary files a/doc/src/template/images/bg_ul.png and /dev/null differ diff --git a/doc/src/template/images/bg_ul_blank.png b/doc/src/template/images/bg_ul_blank.png deleted file mode 100755 index 7051261..0000000 Binary files a/doc/src/template/images/bg_ul_blank.png and /dev/null differ diff --git a/doc/src/template/images/bg_ur.png b/doc/src/template/images/bg_ur.png deleted file mode 100755 index bfa51a4..0000000 Binary files a/doc/src/template/images/bg_ur.png and /dev/null differ diff --git a/doc/src/template/images/bg_ur_blank.png b/doc/src/template/images/bg_ur_blank.png deleted file mode 100755 index 5779961..0000000 Binary files a/doc/src/template/images/bg_ur_blank.png and /dev/null differ diff --git a/doc/src/template/images/box_bg.png b/doc/src/template/images/box_bg.png index 232655a..3322f92 100755 Binary files a/doc/src/template/images/box_bg.png and b/doc/src/template/images/box_bg.png differ diff --git a/doc/src/template/images/breadcrumb.png b/doc/src/template/images/breadcrumb.png index f0571ce..0ded551 100755 Binary files a/doc/src/template/images/breadcrumb.png and b/doc/src/template/images/breadcrumb.png differ diff --git a/doc/src/template/images/bullet_gt.png b/doc/src/template/images/bullet_gt.png index 8875925..7561b4e 100755 Binary files a/doc/src/template/images/bullet_gt.png and b/doc/src/template/images/bullet_gt.png differ diff --git a/doc/src/template/images/bullet_sq.png b/doc/src/template/images/bullet_sq.png index db85ee3..a84845e 100755 Binary files a/doc/src/template/images/bullet_sq.png and b/doc/src/template/images/bullet_sq.png differ diff --git a/doc/src/template/images/content_bg.png b/doc/src/template/images/content_bg.png deleted file mode 100755 index 416397d..0000000 Binary files a/doc/src/template/images/content_bg.png and /dev/null differ diff --git a/doc/src/template/images/form_bg.png b/doc/src/template/images/form_bg.png deleted file mode 100755 index bf2ee54..0000000 Binary files a/doc/src/template/images/form_bg.png and /dev/null differ diff --git a/doc/src/template/images/header.png b/doc/src/template/images/header.png deleted file mode 100644 index 141488b..0000000 Binary files a/doc/src/template/images/header.png and /dev/null differ diff --git a/doc/src/template/images/page_bg.png b/doc/src/template/images/page_bg.png index fb7d051..9b3bd99 100755 Binary files a/doc/src/template/images/page_bg.png and b/doc/src/template/images/page_bg.png differ diff --git a/doc/src/template/images/print.png b/doc/src/template/images/print.png deleted file mode 100755 index 4581da1..0000000 Binary files a/doc/src/template/images/print.png and /dev/null differ diff --git a/doc/src/template/images/qt_guide.png b/doc/src/template/images/qt_guide.png deleted file mode 100755 index 9f53a05..0000000 Binary files a/doc/src/template/images/qt_guide.png and /dev/null differ diff --git a/doc/src/template/images/qt_icon.png b/doc/src/template/images/qt_icon.png deleted file mode 100755 index fbaee35..0000000 Binary files a/doc/src/template/images/qt_icon.png and /dev/null differ diff --git a/doc/src/template/images/qt_ref_doc.png b/doc/src/template/images/qt_ref_doc.png deleted file mode 100755 index 141488b..0000000 Binary files a/doc/src/template/images/qt_ref_doc.png and /dev/null differ diff --git a/doc/src/template/images/qt_tools.png b/doc/src/template/images/qt_tools.png deleted file mode 100755 index cc24179..0000000 Binary files a/doc/src/template/images/qt_tools.png and /dev/null differ diff --git a/doc/src/template/images/sep.png b/doc/src/template/images/sep.png deleted file mode 100755 index c895646..0000000 Binary files a/doc/src/template/images/sep.png and /dev/null differ diff --git a/doc/src/template/scripts/functions.js b/doc/src/template/scripts/functions.js index fa454e3..b2e791c 100755 --- a/doc/src/template/scripts/functions.js +++ b/doc/src/template/scripts/functions.js @@ -1,4 +1,3 @@ - /* START non link areas where cursor should change to pointing hand */ $('.t_button').mouseover(function() { $('.t_button').css('cursor','pointer'); @@ -35,27 +34,250 @@ $('#bigA').click(function() { $(this).addClass('active') }); -function doSearch(str){ - -if (str.length>3) - { - alert('Search is not yet activated.'); - // document.getElementById("refWrapper").innerHTML=""; - return; - } - else - return; - -// var url="indexSearch.php"; -// url=url+"?q="+str; - // url=url+"&sid="+Math.random(); - // var url="http://localhost:8983/solr/select?"; - // url=url+"&q="+str; - // url=url+"&fq=&start=0&rows=10&fl=&qt=&wt=&explainOther=&hl.fl="; - - // $.get(url, function(data){ - // alert(data); - // document.getElementById("refWrapper").innerHTML=data; - //}); - -} \ No newline at end of file + +var lookupCount = 0; +var articleCount = 0; +var exampleCount = 0; +var qturl = ""; // change to 0 +function processNokiaData(response){ + + var propertyTags = response.getElementsByTagName('page'); + var ulStartElement = "
    "; + var ulEndElement = "
"; + + for (var i=0; i< propertyTags.length; i++) { + + var full_address_lookup = "' ; + + // var rowlookup = document.getElementById('div001').insertRow(-1); + // var celllookup = rowlookup.insertCell(-1); + // celllookup.style.padding="0 0 0 0"; + // lookupCount++; + // celllookup.innerHTML = full_address_lookup ; + // document.getElementById('list001').style.display = "none"; + + //
  • + //var listElement = "
    • '; + + } + } + + if(propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Article'){ + articleCount = 0; + document.getElementById('live002').style.display = "block"; + // document.getElementById('live002').style.height = "150px"; + for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++){ + full_address_topic = full_address_topic + propertyTags[i].getElementsByTagName('pageUrl')[j].firstChild.nodeValue; + full_address_topic = full_address_topic + "'>" + propertyTags[i].getElementsByTagName('pageTitle')[0].firstChild.nodeValue + + ''; + // var rowlookup = document.getElementById('div002').insertRow(-1); + // var celllookup = rowlookup.insertCell(-1); + // celllookup.style.padding="0 0 0 0"; + // articleCount++; + // celllookup.innerHTML = full_address_topic; + // document.getElementById('list002').style.display = "none"; + } + } + if(propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Example'){ + exampleCount = 0; + document.getElementById('live003').style.display = "block"; + // document.getElementById('live003').style.height = "150px"; + for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++){ + full_address_examples = full_address_examples + propertyTags[i].getElementsByTagName('pageUrl')[j].firstChild.nodeValue; + full_address_examples = full_address_examples + "'>" + propertyTags[i].getElementsByTagName('pageTitle')[0].firstChild.nodeValue + + ''; + // var rowlookup = document.getElementById('div003').insertRow(-1); + // var celllookup = rowlookup.insertCell(-1); + // celllookup.style.padding="0 0 0 0"; + // exampleCount++; + // celllookup.innerHTML = full_address_examples; + // document.getElementById('list003').style.display = "none"; + } + } + + } + + + + if(lookupCount == 0){loadLookupList();} + if(articleCount == 0){loadArticleList();} + if(exampleCount == 0){loadExampleList();} + // reset count variables; + lookupCount=0; + articleCount = 0; + exampleCount = 0; + +} +function removeResults() { + /* var resultsTableLookup = document.getElementById('div001'); + var recordslookup = resultsTableLookup.rows.length; + + for (var i=(recordslookup-1); i> 0; i--){ + // resultsTableLookup.deleteRow(i); + + } + + var resultsTableTopic = document.getElementById('div002'); + var recordstopic = resultsTableTopic.rows.length; + for (var i=(recordstopic-1); i> 0; i--){ + // alert("delete: " + i); + // resultsTableTopic.deleteRow(i); + } + + + var resultsTableexample = document.getElementById('div003'); + var recordsexample = resultsTableexample.rows.length; + for (var i=(recordsexample-1); i> 0; i--) + // resultsTableexample.deleteRow(i); + */ + removeList(); +} + +function removeList(){ + // var resultsTableLookuplist = document.getElementById('tbl001'); + // var recordlookuplist = resultsTableLookuplist.rows.length; + // for (var i=(recordlookuplist-1); i> 0; i--) + // resultsTableLookuplist.deleteRow(i); + + // var resultsTableArticlelist = document.getElementById('tbl002'); + // var recordArticlelist = resultsTableArticlelist.rows.length; + // for (var i=(recordArticlelist-1); i> 0; i--) + // resultsTableArticlelist.deleteRow(i); + + // var resultsTableExamplelist = document.getElementById('tbl003'); + // var recordExamplelist = resultsTableExamplelist.rows.length; + // for (var i=(recordExamplelist-1); i> 0; i--) + // resultsTableExamplelist.deleteRow(i); + } + +//build regular expression object to find empty string or any number of blank +var blankRE=/^\s*$/; +function CheckEmptyAndLoadList() +{ + var value = document.getElementById('pageType').value; + if((blankRE.test(value)) || (value.length < 3)) + { + //empty inputbox + loadAllList(); + //alert("loadAllList"); + document.getElementById('live001').style.display = "none"; + document.getElementById('live002').style.display = "none"; + document.getElementById('live003').style.display = "none"; + document.getElementById('list001').style.display = "block"; + document.getElementById('list002').style.display = "block"; + document.getElementById('list003').style.display = "block"; + }else{ + removeList(); + //alert("removeList"); + document.getElementById('live001').style.display = "block"; + document.getElementById('live002').style.display = "block"; + document.getElementById('live003').style.display = "block"; + + } +} +function loadAllList(){ + + var fullAddressListLookup = ""; + // var rowlistlookup = document.getElementById('tbl001').insertRow(-1); + // var celllistlookup = rowlistlookup.insertCell(-1); + // celllistlookup.style.padding="0 0 0 0"; + //celllistlookup.style.width="10px"; + //celllistlookup.style.background = "yellow"; + //celllistlookup.innerHTML = fullAddressListLookup ; + + + + + var fullAddressListArticle = ""; + // var rowlistarticle = document.getElementById('tbl002').insertRow(-1); + // var celllistarticle = rowlistarticle.insertCell(-1); + // celllistarticle.style.padding="0 0 0 0"; + //celllistarticle.innerHTML = fullAddressListArticle ; + + + var fullAddressListExample = ""; + // var rowlistexample = document.getElementById('tbl003').insertRow(-1); + // var celllistexample = rowlistexample.insertCell(-1); + // celllistexample.style.padding="0 0 0 0"; + //celllistexample.innerHTML = fullAddressListExample ; + +} + +function loadLookupList(){ + + var fullAddressListLookup = ""; + // var rowlistlookup = document.getElementById('tbl001').insertRow(-1); + // var celllistlookup = rowlistlookup.insertCell(-1); + // celllistlookup.style.padding="0 0 0 0"; + //celllistlookup.style.width="10px"; + //celllistlookup.style.background = "yellow"; + celllistlookup.innerHTML = fullAddressListLookup ; + document.getElementById('live001').style.display = "none"; + document.getElementById('list001').style.display = "block"; + //alert("loadLookupList") + +} +function loadArticleList(){ + + var fullAddressListArticle = ""; + // var rowlistarticle = document.getElementById('tbl002').insertRow(-1); + // var celllistarticle = rowlistarticle.insertCell(-1); + // celllistarticle.style.padding="0 0 0 0"; + celllistarticle.innerHTML = fullAddressListArticle ; + document.getElementById('live002').style.display = "none"; + document.getElementById('list002').style.display = "block"; + } + +function loadExampleList(){ + + var fullAddressListExample = ""; + // var rowlistexample = document.getElementById('tbl003').insertRow(-1); + // var celllistexample = rowlistexample.insertCell(-1); + // celllistexample.style.padding="0 0 0 0"; + celllistexample.innerHTML = fullAddressListExample ; + document.getElementById('live003').style.display = "none"; + document.getElementById('list003').style.display = "block"; + +} + + diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css index eb8434c..9c290f5 100755 --- a/doc/src/template/style/style.css +++ b/doc/src/template/style/style.css @@ -58,7 +58,7 @@ { vertical-align: baseline; } - .heading + .heading { font: normal 600 16px/1.0 Arial; padding-bottom: 15px; @@ -86,7 +86,6 @@ { font-size: 100%; } - html { background-color: #e5e5e5; @@ -105,13 +104,11 @@ { font-style: italic; } - a { color: #00732f; text-decoration: none; } - .header, .footer, .wrapper { min-width: 600px; @@ -140,7 +137,6 @@ overflow: hidden; background: url(../images/page.png) no-repeat 100% -30px; } - .wrapper .bd { background: url(../images/bg_l.png) repeat-y 0 0; @@ -153,19 +149,18 @@ .wrapper .ft { padding-left: 216px; - height: 15px; /* background: url(../images/bg_ll.png) no-repeat 0 0; */ + height: 15px; background: url(../images/page.png) no-repeat 0 -75px; overflow: hidden; } .offline .wrapper .ft { - /*background: url(../images/bg_ll_blank.png) no-repeat 0 0;*/ background: url(../images/page.png) no-repeat 0 -90px; } .wrapper .ft span { height: 15px; - display: block; /* background: url(../images/bg_lr.png) no-repeat 100% 0; */ + display: block; background: url(../images/page.png) no-repeat 100% -60px; overflow: hidden; } @@ -215,13 +210,7 @@ { display: none; } - /* - .sidebar a - { - color: #00732f; - text-decoration: none; - } - */ + .sidebar .searchlabel { padding: 0 0 2px 17px; @@ -235,20 +224,13 @@ .sidebar .search form { - /* width: 167px; height: 21px; padding: 2px 0 0 5px;*/ /* background: url(../images/form_bg.png) no-repeat 0 0;*/ background: url(../images/sprites-combined.png) no-repeat -6px -348px; + height:21px; + padding:2px 0 0 5px; + width:167px; } - - - - - - - - - - .sidebar .search form input#searchstring + .sidebar .search form input#pageType { width: 158px; height: 19px; @@ -271,7 +253,7 @@ .sidebar .box h2 { font: normal 18px/1.2 Arial; - padding: 0; /*15px 0 0 40px;*/ + padding: 0; min-height: 32px; } .sidebar .box h2 span @@ -281,7 +263,7 @@ } .sidebar .box#lookup h2 { - background-image: none; /* background: url(../images/api_lookup.png) no-repeat 0 0;*/ + background-image: none; } .sidebar #lookup.box h2 span { @@ -292,7 +274,6 @@ } .sidebar .box#topics h2 { - /* background: url(../images/api_topics.png) no-repeat 0 0;*/ background-image: none; } .sidebar #topics.box h2 span @@ -304,7 +285,6 @@ } .sidebar .box#examples h2 { - /* background: url(../images/api_examples.png) no-repeat 0 0; */ background-image: none; } .sidebar #examples.box h2 span @@ -345,7 +325,7 @@ .wrap { margin: 0 5px 0 208px; - overflow: visible; /* overflow: hidden; */ + overflow: visible; } .offline .wrap { @@ -355,7 +335,7 @@ { background-color: #fafafa; border-bottom: 1px solid #d1d1d1; - height: 20px; /* margin-left: 3px; margin-right: 5px;*/ + height: 20px; position: relative; } .wrap .toolbar .toolblock @@ -417,7 +397,6 @@ background: url(../images/sprites-combined.png) no-repeat -137px -311px; } - .toolbuttons #smallA { font-size: 10pt; @@ -437,13 +416,6 @@ color: #00732F; } - - - - - - - .offline .wrap .breadcrumb { } @@ -484,7 +456,7 @@ background: url(../images/bullet_sq.png) no-repeat 0 5px; font: normal 400 10pt/1 Verdana; color: #44a51c; - margin-bottom: 10px; /*line-height: 14px;*/ + margin-bottom: 10px; } .content li:hover { @@ -498,7 +470,7 @@ .wrap .content h1 { - font: 600 18px/1.2 Arial; /* padding-bottom: 15px;*/ + font: 600 18px/1.2 Arial; } .wrap .content h2 { @@ -539,7 +511,6 @@ } .feedback { - /*float: right;*/ /* padding-right: 10px; */ float: none; position: absolute; right: 15px; @@ -666,7 +637,7 @@ #nav-logo { - background: transparent url( "../images/sprites-combined.png" ) no-repeat 0 -225px; + background: transparent url(../images/sprites-combined.png ) no-repeat 0 -225px; left: -3px; position: absolute; width: 75px; @@ -686,7 +657,7 @@ .shortCut-topleft-inactive { padding-left: 3px; - background: transparent url( "../images/sprites-combined.png" ) no-repeat 0px -58px; + background: transparent url( ../images/sprites-combined.png) no-repeat 0px -58px; height: 20px; width: 47px; } @@ -723,10 +694,6 @@ color: #44a51c; } - /* end of header elements */ - - - hr { background-color: #E6E6E6; @@ -748,7 +715,6 @@ padding: 20px 15px 20px 20px; overflow-x: auto; } - /* tables */ table, pre { -moz-border-radius: 7px 7px 7px 7px; @@ -756,7 +722,7 @@ border: 1px solid #E6E6E6; border-collapse: separate; font-size: 11px; - min-width: 395px; + /*min-width: 395px;*/ margin-bottom: 25px; display: inline-block; } @@ -853,9 +819,6 @@ text-decoration: none; } - - - #feedbox { display: inline; @@ -900,15 +863,13 @@ .wrap .content .toc ul { - /* float: left;*/ padding-left: 0px; } .wrap .content .toc .level2 { - /* float: left;*/ - padding-left: 15px; + margin-left: 15px; } .content .toc li @@ -947,39 +908,42 @@ .indexbox { width: 100%; + display:inline-block; } .indexboxcont { display: block; - overflow: hidden; + /* overflow: hidden;*/ } .indexboxbar { - background: transparent url( "../images/horBar.png" ) repeat-x left bottom; + background: transparent url(../images/horBar.png ) repeat-x left bottom; margin-bottom: 25px; - background-image: none; - border-bottom: 1px solid #e2e2e2; + /* background-image: none; + border-bottom: 1px solid #e2e2e2;*/ } .indexboxcont .section { display: inline-block; width: 49%; - *width:42%; - _width:42%; - padding:02%01%; - vertical-align:top; - } + *width:42%; + _width:42%; + padding:0 2% 0 1%; + vertical-align:top; + +} .indexboxcont .indexIcon { width: 11%; - *width:18%; - _width:18%; - overflow:hidden; - } + *width:18%; + _width:18%; + overflow:hidden; + +} .indexboxcont .section p { padding-top: 20px; @@ -988,7 +952,7 @@ .indexboxcont .sectionlist { display: inline-block; - width: 33%; + width: 33%; padding: 0; } .indexboxcont .sectionlist ul @@ -1031,7 +995,7 @@ { display: block; } - . + .indexbox.guide .indexIcon span { width: 96px; @@ -1039,7 +1003,7 @@ background: url(../images/sprites-combined.png) no-repeat -5px -376px; padding: 0; } - . + .indexbox.tools .indexIcon span { width: 115px; @@ -1061,9 +1025,6 @@ margin-left: -6px; } /* end indexbox */ - - /* end page elements */ - } /* end of screen media */ @@ -1071,7 +1032,7 @@ @media print { - .header, .footer, .toolbar, .feedback, .wrapper .hd, .wrapper .bd .sidebar, .wrapper .ft + input, textarea, .header, .footer, .toolbar, .feedback, .wrapper .hd, .wrapper .bd .sidebar, .wrapper .ft { display: none; background: none; diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index f6d008f..5816b8e 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -830,7 +830,7 @@ int HtmlGenerator::generateAtom(const Atom *atom, out() << "" << ":

    \n"; generateSection(nlist, 0, marker, CodeMarker::Summary); - out() << "
    "; + out() << "
    "; ++pmap; } } @@ -876,7 +876,7 @@ int HtmlGenerator::generateAtom(const Atom *atom, out() << "
    "; break; case Atom::LineBreak: - out() << "
    "; + out() << "
    "; break; case Atom::Link: { @@ -1585,7 +1585,7 @@ void HtmlGenerator::generateFakeNode(const FakeNode *fake, CodeMarker *marker) NodeList::ConstIterator m = (*s).members.begin(); while (m != (*s).members.end()) { generateDetailedQmlMember(*m, fake, marker); - out() << "
    \n"; + out() << "
    \n"; fakeSection.keywords += qMakePair((*m)->name(), linkForNode(*m,0)); ++m; @@ -1790,27 +1790,39 @@ void HtmlGenerator::generateHeader(const QString& title, //out() << " Qt Reference Documentation"; out() << " \n"; - out() << " \n"; - out() << " \n"; - out() << " \n"; - out() << " \n"; out() << " \n"; - out() << " \n"; + out() << " \n"; out() << "\n"; if (offlineDocs) - out() << "\n"; + out() << "\n"; else - out() << "\n"; + out() << "\n"; #ifdef GENERATE_MAC_REFS if (mainPage) @@ -1833,18 +1845,16 @@ void HtmlGenerator::generateTitle(const QString& title, CodeMarker *marker) { if (!title.isEmpty()) - out() << "

    " << protectEnc(title); + out() << "

    " << protectEnc(title) << "

    \n"; if (!subTitle.isEmpty()) { - out() << "
    "; - if (subTitleSize == SmallSubTitle) - out() << ""; + out() << ""; else - out() << ""; + out() << " class=\"subtitle\">"; generateText(subTitle, relative, marker); out() << "\n"; } - if (!title.isEmpty()) - out() << "\n"; } void HtmlGenerator::generateFooter(const Node *node) @@ -1853,9 +1863,10 @@ void HtmlGenerator::generateFooter(const Node *node) out() << "

    \n" << navigationLinks << "

    \n"; out() << QString(footer).replace("\\" + COMMAND_VERSION, myTree->version()) - << QString(address).replace("\\" + COMMAND_VERSION, myTree->version()) - << "\n" - "\n"; + << QString(address).replace("\\" + COMMAND_VERSION, myTree->version()); + out() << " \n"; + out() << "\n"; + out() << "\n"; } void HtmlGenerator::generateBrief(const Node *node, CodeMarker *marker, @@ -1876,7 +1887,7 @@ void HtmlGenerator::generateBrief(const Node *node, CodeMarker *marker, void HtmlGenerator::generateIncludes(const InnerNode *inner, CodeMarker *marker) { if (!inner->includes().isEmpty()) { - out() << "
    "
+        out() << "
    "
               << trimmedTrailing(highlightedCode(indent(codeIndent,
                                                         marker->markedUpIncludes(inner->includes())),
                                                  marker,inner))
@@ -3766,7 +3777,7 @@ void HtmlGenerator::generateDetailedMember(const Node *node,
         out() << "
    ";
         out() << "";
         generateSynopsis(enume, relative, marker, CodeMarker::Detailed);
-        out() << "
    ";
+        out() << "
    ";
         generateSynopsis(enume->flagsType(),
                          relative,
                          marker,
diff --git a/tools/qdoc3/test/assistant.qdocconf b/tools/qdoc3/test/assistant.qdocconf
index 1deefce..112b1b2 100644
--- a/tools/qdoc3/test/assistant.qdocconf
+++ b/tools/qdoc3/test/assistant.qdocconf
@@ -16,45 +16,28 @@ qhp.Assistant.file                = assistant.qhp
 qhp.Assistant.namespace           = com.trolltech.assistant.470
 qhp.Assistant.virtualFolder       = qdoc
 qhp.Assistant.indexTitle          = Qt Assistant Manual
-qhp.Assistant.extraFiles          = images/api_examples.png \
-                             	    images/api_lookup.png \
-                             	    images/api_topics.png \
+qhp.Assistant.extraFiles          = 									images/bg_l.png \
                              	    images/bg_l_blank.png \
-			     	    images/bg_ll_blank.png \
-                             	    images/bg_ll.png \
-                             	    images/bg_l.png \
-                             	    images/bg_lr.png \
                              	    images/bg_r.png \
-                             	    images/bg_ul_blank.png \
-                             	    images/bg_ul.png \
-                             	    images/bg_ur_blank.png \
-                             	    images/bg_ur.png \
-			     	    images/box_bg.png \
-                             	    images/breadcrumb.png \
+									images/box_bg.png \
+									images/breadcrumb.png \
+									images/bullet_gt.png \
                              	    images/bullet_dn.png \
-                             	    images/bullet_gt.png \
-                             	    images/bullet_sq.png \
+									images/bullet_sq.png \
                              	    images/bullet_up.png \
-                             	    images/coloreditorfactoryimage.png \
-                             	    images/content_bg.png \
-                             	    images/dynamiclayouts-example.png \
                              	    images/feedbackground.png \
-                             	    images/form_bg.png \
                              	    images/horBar.png \
-                             	    images/page_bg.png \
-                             	    images/print.png \
-                             	    images/qt_guide.png \
-                             	    images/qt_icon.png \
-                             	    images/qt-logo.png \
-                             	    images/qt_ref_doc.png \
-                             	    images/qt_tools.png \
-                             	    images/sep.png \
-                             	    images/sprites-combined.png \
+									images/page.png \
+									images/page_bg.png \
+									images/sprites-combined.png \
                              	    images/stylesheet-coffee-plastique.png \
                              	    images/taskmenuextension-example.png \
-			     	    scripts/functions.js \
-			     	    scripts/jquery.js \
+                             	   images/coloreditorfactoryimage.png \
+                             	   images/dynamiclayouts-example.png \
+									scripts/functions.js \
+									scripts/jquery.js \
                              	    style/style.css
+
 qhp.Assistant.filterAttributes    = qt 4.7.0 tools assistant
 qhp.Assistant.customFilters.Assistant.name = Qt Assistant Manual
 qhp.Assistant.customFilters.Assistant.filterAttributes = qt tools assistant
diff --git a/tools/qdoc3/test/designer.qdocconf b/tools/qdoc3/test/designer.qdocconf
index 513801a..d4da292 100644
--- a/tools/qdoc3/test/designer.qdocconf
+++ b/tools/qdoc3/test/designer.qdocconf
@@ -16,45 +16,28 @@ qhp.Designer.file                = designer.qhp
 qhp.Designer.namespace           = com.trolltech.designer.470
 qhp.Designer.virtualFolder       = qdoc
 qhp.Designer.indexTitle          = Qt Designer Manual
-qhp.Designer.extraFiles          = images/api_examples.png \
-                             	   images/api_lookup.png \
-                             	   images/api_topics.png \
-                             	   images/bg_l_blank.png \
-			     	   images/bg_ll_blank.png \
-                             	   images/bg_ll.png \
-                             	   images/bg_l.png \
-                             	   images/bg_lr.png \
-                             	   images/bg_r.png \
-                             	   images/bg_ul_blank.png \
-                             	   images/bg_ul.png \
-                             	   images/bg_ur_blank.png \
-                             	   images/bg_ur.png \
-			     	   images/box_bg.png \
-                             	   images/breadcrumb.png \
-                             	   images/bullet_dn.png \
-                             	   images/bullet_gt.png \
-                             	   images/bullet_sq.png \
-                             	   images/bullet_up.png \
+qhp.Designer.extraFiles          = images/bg_l.png \
+                             	    images/bg_l_blank.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/feedbackground.png \
+                             	    images/horBar.png \
+									images/page.png \
+									images/page_bg.png \
+									images/sprites-combined.png \
+                             	    images/stylesheet-coffee-plastique.png \
+                             	    images/taskmenuextension-example.png \
                              	   images/coloreditorfactoryimage.png \
-                             	   images/content_bg.png \
                              	   images/dynamiclayouts-example.png \
-                             	   images/feedbackground.png \
-                             	   images/form_bg.png \
-                             	   images/horBar.png \
-                             	   images/page_bg.png \
-                             	   images/print.png \
-                             	   images/qt_guide.png \
-                             	   images/qt_icon.png \
-                             	   images/qt-logo.png \
-                             	   images/qt_ref_doc.png \
-                             	   images/qt_tools.png \
-                             	   images/sep.png \
-                             	   images/sprites-combined.png \
-                             	   images/stylesheet-coffee-plastique.png \
-                             	   images/taskmenuextension-example.png \
-			     	   scripts/functions.js \
-			     	   scripts/jquery.js \
-                             	   style/style.css
+									scripts/functions.js \
+									scripts/jquery.js \
+                             	    style/style.css
+
 qhp.Designer.filterAttributes    = qt 4.7.0 tools designer
 qhp.Designer.customFilters.Designer.name = Qt Designer Manual
 qhp.Designer.customFilters.Designer.filterAttributes = qt tools designer
diff --git a/tools/qdoc3/test/linguist.qdocconf b/tools/qdoc3/test/linguist.qdocconf
index a3f4f00..7420b4f 100644
--- a/tools/qdoc3/test/linguist.qdocconf
+++ b/tools/qdoc3/test/linguist.qdocconf
@@ -16,45 +16,28 @@ qhp.Linguist.file                = linguist.qhp
 qhp.Linguist.namespace           = com.trolltech.linguist.470
 qhp.Linguist.virtualFolder       = qdoc
 qhp.Linguist.indexTitle          = Qt Linguist Manual
-qhp.Linguist.extraFiles          = images/api_examples.png \
-                             	   images/api_lookup.png \
-                             	   images/api_topics.png \
-                             	   images/bg_l_blank.png \
-			     	   images/bg_ll_blank.png \
-                             	   images/bg_ll.png \
-                             	   images/bg_l.png \
-                             	   images/bg_lr.png \
-                             	   images/bg_r.png \
-                             	   images/bg_ul_blank.png \
-                             	   images/bg_ul.png \
-                             	   images/bg_ur_blank.png \
-                             	   images/bg_ur.png \
-			     	   images/box_bg.png \
-                             	   images/breadcrumb.png \
-                             	   images/bullet_dn.png \
-                             	   images/bullet_gt.png \
-                             	   images/bullet_sq.png \
-                             	   images/bullet_up.png \
+qhp.Linguist.extraFiles          = images/bg_l.png \
+                             	    images/bg_l_blank.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/feedbackground.png \
+                             	    images/horBar.png \
+									images/page.png \
+									images/page_bg.png \
+									images/sprites-combined.png \
+                             	    images/stylesheet-coffee-plastique.png \
+                             	    images/taskmenuextension-example.png \
                              	   images/coloreditorfactoryimage.png \
-                             	   images/content_bg.png \
                              	   images/dynamiclayouts-example.png \
-                             	   images/feedbackground.png \
-                             	   images/form_bg.png \
-                             	   images/horBar.png \
-                             	   images/page_bg.png \
-                             	   images/print.png \
-                             	   images/qt_guide.png \
-                             	   images/qt_icon.png \
-                             	   images/qt-logo.png \
-                             	   images/qt_ref_doc.png \
-                             	   images/qt_tools.png \
-                             	   images/sep.png \
-                             	   images/sprites-combined.png \
-                             	   images/stylesheet-coffee-plastique.png \
-                             	   images/taskmenuextension-example.png \
-			     	   scripts/functions.js \
-			     	   scripts/jquery.js \
-                             	   style/style.css
+									scripts/functions.js \
+									scripts/jquery.js \
+                             	    style/style.css
+
 qhp.Linguist.filterAttributes    = qt 4.7.0 tools linguist
 qhp.Linguist.customFilters.Linguist.name = Qt Linguist Manual
 qhp.Linguist.customFilters.Linguist.filterAttributes = qt tools linguist
diff --git a/tools/qdoc3/test/qdeclarative.qdocconf b/tools/qdoc3/test/qdeclarative.qdocconf
index 80050e3..8015f57 100644
--- a/tools/qdoc3/test/qdeclarative.qdocconf
+++ b/tools/qdoc3/test/qdeclarative.qdocconf
@@ -27,45 +27,27 @@ qhp.Qml.indexTitle          = Qml Reference
 
 # Files not referenced in any qdoc file
 # See also extraimages.HTML
-qhp.Qml.extraFiles            = images/api_examples.png \
-                             	images/api_lookup.png \
-                             	images/api_topics.png \
-                             	images/bg_l_blank.png \
-			     	images/bg_ll_blank.png \
-                             	images/bg_ll.png \
-                             	images/bg_l.png \
-                             	images/bg_lr.png \
-                             	images/bg_r.png \
-                             	images/bg_ul_blank.png \
-                             	images/bg_ul.png \
-                             	images/bg_ur_blank.png \
-                             	images/bg_ur.png \
-			     	images/box_bg.png \
-                             	images/breadcrumb.png \
-                             	images/bullet_dn.png \
-                             	images/bullet_gt.png \
-                             	images/bullet_sq.png \
-                             	images/bullet_up.png \
-                             	images/coloreditorfactoryimage.png \
-                             	images/content_bg.png \
-                             	images/dynamiclayouts-example.png \
-                             	images/feedbackground.png \
-                             	images/form_bg.png \
-                             	images/horBar.png \
-                             	images/page_bg.png \
-                             	images/print.png \
-                             	images/qt_guide.png \
-                             	images/qt_icon.png \
-                             	images/qt-logo.png \
-                             	images/qt_ref_doc.png \
-                             	images/qt_tools.png \
-                             	images/sep.png \
-                             	images/sprites-combined.png \
-                             	images/stylesheet-coffee-plastique.png \
-                             	images/taskmenuextension-example.png \
-			     	scripts/functions.js \
-			     	scripts/jquery.js \
-                             	style/style.css
+qhp.Qml.extraFiles            = images/bg_l.png \
+                             	    images/bg_l_blank.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/feedbackground.png \
+                             	    images/horBar.png \
+									images/page.png \
+									images/page_bg.png \
+									images/sprites-combined.png \
+                             	    images/stylesheet-coffee-plastique.png \
+                             	    images/taskmenuextension-example.png \
+                             	   images/coloreditorfactoryimage.png \
+                             	   images/dynamiclayouts-example.png \
+									scripts/functions.js \
+									scripts/jquery.js \
+                             	    style/style.css
 
 qhp.Qml.filterAttributes    = qt 4.6.0 qtrefdoc
 qhp.Qml.customFilters.Qt.name = Qt 4.6.0
diff --git a/tools/qdoc3/test/qmake.qdocconf b/tools/qdoc3/test/qmake.qdocconf
index f38a2a4..49d088e 100644
--- a/tools/qdoc3/test/qmake.qdocconf
+++ b/tools/qdoc3/test/qmake.qdocconf
@@ -16,45 +16,28 @@ qhp.qmake.file                = qmake.qhp
 qhp.qmake.namespace           = com.trolltech.qmake.470
 qhp.qmake.virtualFolder       = qdoc
 qhp.qmake.indexTitle          = QMake Manual
-qhp.qmake.extraFiles          = images/api_examples.png \
-                             	images/api_lookup.png \
-                             	images/api_topics.png \
-                             	images/bg_l_blank.png \
-			     	images/bg_ll_blank.png \
-                             	images/bg_ll.png \
-                             	images/bg_l.png \
-                             	images/bg_lr.png \
-                             	images/bg_r.png \
-                             	images/bg_ul_blank.png \
-                             	images/bg_ul.png \
-                             	images/bg_ur_blank.png \
-                             	images/bg_ur.png \
-			     	images/box_bg.png \
-                             	images/breadcrumb.png \
-                             	images/bullet_dn.png \
-                             	images/bullet_gt.png \
-                             	images/bullet_sq.png \
-                             	images/bullet_up.png \
-                             	images/coloreditorfactoryimage.png \
-                             	images/content_bg.png \
-                             	images/dynamiclayouts-example.png \
-                             	images/feedbackground.png \
-                             	images/form_bg.png \
-                             	images/horBar.png \
-                             	images/page_bg.png \
-                             	images/print.png \
-                             	images/qt_guide.png \
-                             	images/qt_icon.png \
-                             	images/qt-logo.png \
-                             	images/qt_ref_doc.png \
-                             	images/qt_tools.png \
-                             	images/sep.png \
-                             	images/sprites-combined.png \
-                             	images/stylesheet-coffee-plastique.png \
-                             	images/taskmenuextension-example.png \
-			     	scripts/functions.js \
-			     	scripts/jquery.js \
-                             	style/style.css
+qhp.qmake.extraFiles          = images/bg_l.png \
+                             	    images/bg_l_blank.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/feedbackground.png \
+									images/horBar.png \
+									images/page.png \
+									images/page_bg.png \
+									images/sprites-combined.png \
+                             	    images/stylesheet-coffee-plastique.png \
+                             	    images/taskmenuextension-example.png \
+                             	   images/coloreditorfactoryimage.png \
+                             	   images/dynamiclayouts-example.png \
+									scripts/functions.js \
+									scripts/jquery.js \
+                             	    style/style.css
+
 qhp.qmake.filterAttributes    = qt 4.7.0 tools qmake
 qhp.qmake.customFilters.qmake.name = qmake Manual
 qhp.qmake.customFilters.qmake.filterAttributes = qt tools qmake
diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf
index 0694748..f0c2535 100644
--- a/tools/qdoc3/test/qt-build-docs.qdocconf
+++ b/tools/qdoc3/test/qt-build-docs.qdocconf
@@ -22,45 +22,27 @@ qhp.Qt.indexTitle          = Qt Reference Documentation
 # Files not referenced in any qdoc file (last four are needed by qtdemo)
 # See also extraimages.HTML
 qhp.Qt.extraFiles          = index.html \
-                             images/api_examples.png \
-                             images/api_lookup.png \
-                             images/api_topics.png \
-                             images/bg_l_blank.png \
-			     images/bg_ll_blank.png \
-                             images/bg_ll.png \
-                             images/bg_l.png \
-                             images/bg_lr.png \
-                             images/bg_r.png \
-                             images/bg_ul_blank.png \
-                             images/bg_ul.png \
-                             images/bg_ur_blank.png \
-                             images/bg_ur.png \
-			     images/box_bg.png \
-                             images/breadcrumb.png \
-                             images/bullet_dn.png \
-                             images/bullet_gt.png \
-                             images/bullet_sq.png \
-                             images/bullet_up.png \
-                             images/coloreditorfactoryimage.png \
-                             images/content_bg.png \
-                             images/dynamiclayouts-example.png \
-                             images/feedbackground.png \
-                             images/form_bg.png \
-                             images/horBar.png \
-                             images/page_bg.png \
-                             images/print.png \
-                             images/qt_guide.png \
-                             images/qt_icon.png \
-                             images/qt-logo.png \
-                             images/qt_ref_doc.png \
-                             images/qt_tools.png \
-                             images/sep.png \
-                             images/sprites-combined.png \
-                             images/stylesheet-coffee-plastique.png \
-                             images/taskmenuextension-example.png \
-			     scripts/functions.js \
-			     scripts/jquery.js \
-                             style/style.css
+ 									images/bg_l.png \
+                             	    images/bg_l_blank.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/feedbackground.png \
+                             	    images/horBar.png \
+									images/page.png \
+									images/page_bg.png \
+									images/sprites-combined.png \
+                             	    images/stylesheet-coffee-plastique.png \
+                             	    images/taskmenuextension-example.png \
+                             	   images/coloreditorfactoryimage.png \
+                             	   images/dynamiclayouts-example.png \
+									scripts/functions.js \
+									scripts/jquery.js \
+                             	    style/style.css
 
 
 
diff --git a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
index 5a3d726..a00d5a1 100644
--- a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
+++ b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
@@ -30,45 +30,27 @@ qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.0
 # Files not referenced in any qdoc file (last four are needed by qtdemo)
 # See also extraimages.HTML
 qhp.Qt.extraFiles          = index.html \
-                             images/api_examples.png \
-                             images/api_lookup.png \
-                             images/api_topics.png \
-                             images/bg_l_blank.png \
-			     images/bg_ll_blank.png \
-                             images/bg_ll.png \
-                             images/bg_l.png \
-                             images/bg_lr.png \
-                             images/bg_r.png \
-                             images/bg_ul_blank.png \
-                             images/bg_ul.png \
-                             images/bg_ur_blank.png \
-                             images/bg_ur.png \
-			     images/box_bg.png \
-                             images/breadcrumb.png \
-                             images/bullet_dn.png \
-                             images/bullet_gt.png \
-                             images/bullet_sq.png \
-                             images/bullet_up.png \
-                             images/coloreditorfactoryimage.png \
-                             images/content_bg.png \
-                             images/dynamiclayouts-example.png \
-                             images/feedbackground.png \
-                             images/form_bg.png \
-                             images/horBar.png \
-                             images/page_bg.png \
-                             images/print.png \
-                             images/qt_guide.png \
-                             images/qt_icon.png \
-                             images/qt-logo.png \
-                             images/qt_ref_doc.png \
-                             images/qt_tools.png \
-                             images/sep.png \
-                             images/sprites-combined.png \
-                             images/stylesheet-coffee-plastique.png \
-                             images/taskmenuextension-example.png \
-			     scripts/functions.js \
-			     scripts/jquery.js \
-                             style/style.css
+									images/bg_l.png \
+                             	    images/bg_l_blank.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/feedbackground.png \									
+                             	    images/horBar.png \									
+									images/page.png \
+									images/page_bg.png \
+									images/sprites-combined.png \
+                             	    images/stylesheet-coffee-plastique.png \
+                             	    images/taskmenuextension-example.png \
+                             	   images/coloreditorfactoryimage.png \
+                             	   images/dynamiclayouts-example.png \
+									scripts/functions.js \
+									scripts/jquery.js \
+                             	    style/style.css
 
 language                = Cpp
 
diff --git a/tools/qdoc3/test/qt-defines.qdocconf b/tools/qdoc3/test/qt-defines.qdocconf
index 0426f4d..dc81757 100644
--- a/tools/qdoc3/test/qt-defines.qdocconf
+++ b/tools/qdoc3/test/qt-defines.qdocconf
@@ -20,37 +20,20 @@ codeindent              = 1
 # See also qhp.Qt.extraFiles
 extraimages.HTML        = qt-logo \
                           trolltech-logo \
-			  api_examples.png \
-			  bg_ll.png \
-			  bg_ul_blank.png \
-			  bullet_gt.png \
-			  horBar.png \
-			  qt_ref_doc.png \
-			  api_lookup.png \
-			  bg_ll_blank.png \
-			  bg_ur.png \
-			  bullet_sq.png \
-			  bullet_dn.png \
-			  bullet_up.png \
-			  page_bg.png \
-			  qt_tools.png \
-			  api_topics.png \
-			  bg_lr.png \
-			  bg_ur_blank.png \
-			  content_bg.png \
-			  print.png \
-			  sep.png \
-			  bg_l.png \
-			  bg_r.png \
-			  box_bg.png \
-			  feedbackground.png \
-			  qt_guide.png \
-			  sprites-combined.png \
-			  bg_l_blank.png \
-			  bg_ul.png \
-			  breadcrumb.png \
-			  form_bg.png \
-			  qt_icon.png \
+						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 \
                           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 0651176..00af376 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -33,30 +33,38 @@ HTML.postheader         = " 
    \n" \
 			  "        
    \n" \
 			  "          
    \n" \
 			  "            
    \n" \
-			  "              \n" \
+			  "              \n" \
 			  "            
    \n" \
 			  "          
    \n" \
 			  "        
    \n" \
 			  "        
    \n" \
-			  "          
    \n" \
+			  "          
    \n" \
 			  "            API Lookup
    \n" \
-			  "          
    \n" \
-			  "             \n" \
 			  "          
    \n" \
-			  "          
    \n" \
+			  "          
    \n" \
 			  "          
    \n" \
 			  "        
    \n" \
 			  "        
    \n" \
-			  "          
    \n" \
+			  "          
    \n" \
 			  "            API Topics
    \n" \
-			  "          
    \n" \
-			  "              \n" \
 			  "          
    \n" \
-			  "          
    \n" \
+			  "          
    \n" \
 			  "          
    \n" \
 			  "        
    \n" \
 			  "        
    \n" \
-			  "          
    \n" \
+			  "          
    \n" \
 			  "            API Examples
    \n" \
-			  "          
    \n" \
-			  "             \n" \
 			  "          
    \n" \
-			  "          
    \n" \
+			  "          
    \n" \
 			  "          
    \n" \
 			  "        
    \n" \
 			  "      
    \n" \
@@ -103,13 +116,13 @@ HTML.postpostheader     = "            \n" \
 			  "              
  • A
    • \n" \
 			  "              
  • A
    • \n" \
 			  "              
  • \n" \
-			  "                \"\"\"Print
    • \n" \
+			  "                Print\n" \
 			  "            \n" \
 			  "          
    \n" \
 			  "        
    \n" \
 			  "        
    \n"
 
-HTML.footer             = "        
    \n" \
+HTML.footer             = "        \n" \
 			  "        
    \n" \
 			  "          [+] Documentation Feedback
    \n" \
 			  "      
    \n" \
@@ -117,6 +130,7 @@ HTML.footer             = "
    \n" \ "
    \n" \ " \n" \ "
    \n" \ + "
    \n" \ "
    \n" \ "

    \n" \ " © 2008-2010 Nokia Corporation and/or its\n" \ @@ -131,14 +145,14 @@ HTML.footer = "

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

    \n" \ + "

    \n" \ "
    \n" \ "
    \n" \ "
    \n" \ "
    \n" \ - " -->\n" diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf index 69ab4e1..59dd855 100644 --- a/tools/qdoc3/test/qt.qdocconf +++ b/tools/qdoc3/test/qt.qdocconf @@ -26,45 +26,27 @@ qhp.Qt.indexRoot = # Files not referenced in any qdoc file (last four are needed by qtdemo) # See also extraimages.HTML qhp.Qt.extraFiles = index.html \ - images/api_examples.png \ - images/api_lookup.png \ - images/api_topics.png \ - images/bg_l_blank.png \ - images/bg_ll_blank.png \ - images/bg_ll.png \ - images/bg_l.png \ - images/bg_lr.png \ - images/bg_r.png \ - images/bg_ul_blank.png \ - images/bg_ul.png \ - images/bg_ur_blank.png \ - images/bg_ur.png \ - images/box_bg.png \ - images/breadcrumb.png \ - images/bullet_dn.png \ - images/bullet_gt.png \ - images/bullet_sq.png \ - images/bullet_up.png \ - images/coloreditorfactoryimage.png \ - images/content_bg.png \ - images/dynamiclayouts-example.png \ - images/feedbackground.png \ - images/form_bg.png \ - images/horBar.png \ - images/page_bg.png \ - images/print.png \ - images/qt_guide.png \ - images/qt_icon.png \ - images/qt-logo.png \ - images/qt_ref_doc.png \ - images/qt_tools.png \ - images/sep.png \ - images/sprites-combined.png \ - images/stylesheet-coffee-plastique.png \ - images/taskmenuextension-example.png \ - scripts/functions.js \ - scripts/jquery.js \ - style/style.css + images/bg_l.png \ + images/bg_l_blank.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/feedbackground.png \ + images/horBar.png \ + images/page.png \ + images/page_bg.png \ + images/sprites-combined.png \ + images/stylesheet-coffee-plastique.png \ + images/taskmenuextension-example.png \ + images/coloreditorfactoryimage.png \ + images/dynamiclayouts-example.png \ + scripts/functions.js \ + scripts/jquery.js \ + style/style.css qhp.Qt.filterAttributes = qt 4.7.0 qtrefdoc qhp.Qt.customFilters.Qt.name = Qt 4.7.0 diff --git a/tools/qdoc3/test/qt_zh_CN.qdocconf b/tools/qdoc3/test/qt_zh_CN.qdocconf index a5a65d8..9275b5c 100644 --- a/tools/qdoc3/test/qt_zh_CN.qdocconf +++ b/tools/qdoc3/test/qt_zh_CN.qdocconf @@ -32,45 +32,27 @@ qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.0 # Files not referenced in any qdoc file (last four are needed by qtdemo) # See also extraimages.HTML qhp.Qt.extraFiles = index.html \ - images/api_examples.png \ - images/api_lookup.png \ - images/api_topics.png \ - images/bg_l_blank.png \ - images/bg_ll_blank.png \ - images/bg_ll.png \ - images/bg_l.png \ - images/bg_lr.png \ - images/bg_r.png \ - images/bg_ul_blank.png \ - images/bg_ul.png \ - images/bg_ur_blank.png \ - images/bg_ur.png \ - images/box_bg.png \ - images/breadcrumb.png \ - images/bullet_dn.png \ - images/bullet_gt.png \ - images/bullet_sq.png \ - images/bullet_up.png \ - images/coloreditorfactoryimage.png \ - images/content_bg.png \ - images/dynamiclayouts-example.png \ - images/feedbackground.png \ - images/form_bg.png \ - images/horBar.png \ - images/page_bg.png \ - images/print.png \ - images/qt_guide.png \ - images/qt_icon.png \ - images/qt-logo.png \ - images/qt_ref_doc.png \ - images/qt_tools.png \ - images/sep.png \ - images/sprites-combined.png \ - images/stylesheet-coffee-plastique.png \ - images/taskmenuextension-example.png \ - scripts/functions.js \ - scripts/jquery.js \ - style/style.css + images/bg_l.png \ + images/bg_l_blank.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/feedbackground.png \ + images/horBar.png \ + images/page.png \ + images/page_bg.png \ + images/sprites-combined.png \ + images/stylesheet-coffee-plastique.png \ + images/taskmenuextension-example.png \ + images/coloreditorfactoryimage.png \ + images/dynamiclayouts-example.png \ + scripts/functions.js \ + scripts/jquery.js \ + style/style.css language = Cpp diff --git a/tools/qdoc3/test/style/style.css b/tools/qdoc3/test/style/style.css index 1ed49fa..9c290f5 100644 --- a/tools/qdoc3/test/style/style.css +++ b/tools/qdoc3/test/style/style.css @@ -58,6 +58,19 @@ { vertical-align: baseline; } + .heading + { + font: normal 600 16px/1.0 Arial; + padding-bottom: 15px; + } + .subtitle + { + font-size: 13px; + } + .small-subtitle + { + font-size: 13px; + } legend { color: #000000; @@ -73,7 +86,6 @@ { font-size: 100%; } - /* Page style */ html { background-color: #e5e5e5; @@ -92,6 +104,11 @@ { font-style: italic; } + a + { + color: #00732f; + text-decoration: none; + } .header, .footer, .wrapper { min-width: 600px; @@ -106,23 +123,19 @@ { padding-left: 216px; height: 15px; - background: url(../images/bg_ul.png) no-repeat 0 0; + background: url(../images/page.png) no-repeat 0 0; overflow: hidden; } .offline .wrapper .hd { - background: url(../images/bg_ul_blank.png) no-repeat 0 0; + background: url(../images/page.png) no-repeat 0 -15px; } .wrapper .hd span { height: 15px; display: block; - background: url(../images/bg_ur.png) no-repeat 100% 0; overflow: hidden; - } - .offline .wrapper .hd span - { - /* background: url(../images/bg_ur_blank.png) no-repeat 100% 0; */ + background: url(../images/page.png) no-repeat 100% -30px; } .wrapper .bd { @@ -137,18 +150,18 @@ { padding-left: 216px; height: 15px; - background: url(../images/bg_ll.png) no-repeat 0 0; + background: url(../images/page.png) no-repeat 0 -75px; overflow: hidden; } .offline .wrapper .ft { - background: url(../images/bg_ll_blank.png) no-repeat 0 0; + background: url(../images/page.png) no-repeat 0 -90px; } .wrapper .ft span { height: 15px; display: block; - background: url(../images/bg_lr.png) no-repeat 100% 0; + background: url(../images/page.png) no-repeat 100% -60px; overflow: hidden; } .header, .footer @@ -182,186 +195,9 @@ width: 302px; height: 22px; text-indent: -999em; - background: url(../images/header.png) no-repeat 0 0; - } - /* header elements */ - #nav-topright - { - height: 70px; - } - - #nav-topright ul - { - list-style-type: none; - float: right; - width: 370px; - margin-top: 11px; - } - - #nav-topright li - { - display: inline-block; - margin-right: 20px; - float: left; - } - - #nav-topright li.nav-topright-last - { - margin-right: 0; - } - - #nav-topright li a - { - background: transparent url(../images/sprites-combined.png) no-repeat; - height: 18px; - display: block; - overflow: hidden; - text-indent: -9999px; - } - - #nav-topright li.nav-topright-home a - { - width: 65px; - background-position: -2px -91px; - } - - #nav-topright li.nav-topright-home a:hover - { - background-position: -2px -117px; - } - - - #nav-topright li.nav-topright-dev a - { - width: 30px; - background-position: -76px -91px; - } - - #nav-topright li.nav-topright-dev a:hover - { - background-position: -76px -117px; - } - - - #nav-topright li.nav-topright-labs a - { - width: 40px; - background-position: -114px -91px; - } - - #nav-topright li.nav-topright-labs a:hover - { - background-position: -114px -117px; - } - - #nav-topright li.nav-topright-doc a - { - width: 32px; - background-position: -162px -91px; - } - - #nav-topright li.nav-topright-doc a:hover, #nav-topright li.nav-topright-doc-active a - { - background-position: -162px -117px; - } - - #nav-topright li.nav-topright-blog a - { - width: 40px; - background-position: -203px -91px; - } - - #nav-topright li.nav-topright-blog a:hover, #nav-topright li.nav-topright-blog-active a - { - background-position: -203px -117px; - } - - #nav-topright li.nav-topright-shop a - { - width: 40px; - background-position: -252px -91px; - } - - #nav-topright li.nav-topright-shop a:hover, #nav-topright li.nav-topright-shop-active a - { - background-position: -252px -117px; - } - - #nav-logo - { - background: transparent url( "../images/sprites-combined.png" ) no-repeat 0 -225px; - left: -3px; - position: absolute; - width: 75px; - height: 75px; - top: 13px; - } - #nav-logo a - { - width: 75px; - height: 75px; - display: block; - text-indent: -9999px; - overflow: hidden; - } - /* Clearing */ - .header:after, .footer:after, .breadcrumb:after, .wrap .content:after, .group:after - { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; - } - /* ^ Clearing */ - - - - .shortCut-topleft-inactive - { - padding-left: 3px; - background: transparent url( "../images/sprites-combined.png" ) no-repeat 0px -58px; - height: 20px; - width: 93px; - } - .shortCut-topleft-inactive span - { - font-variant: normal; - } - #shortCut - { - padding-top: 10px; - font-weight: bolder; - color: #b0adab; - } - #shortCut ul - { - list-style-type: none; - float: left; - width: 347px; - margin-left: 100px; - } - #shortCut li - { - display: inline-block; - margin-right: 25px; - float: left; - white-space: nowrap; - } - #shortCut li a - { - color: #b0adab; - text-decoration: none; - } - #shortCut li a:hover - { - color: #44a51c; - text-decoration: none; + background: url(../images/sprites-combined.png) no-repeat -78px -235px; } - /* end of header elements */ - - /* menu element */ .sidebar { float: left; @@ -369,32 +205,32 @@ width: 200px; font-size: 11px; } - .sidebar a - { - color: #00732f; - text-decoration: none; - } - .offline .sidebar, .offline .feedback + + .offline .sidebar, .offline .feedback, .offline .t_button { display: none; } + .sidebar .searchlabel { padding: 0 0 2px 17px; font: normal bold 11px/1.2 Verdana; } + .sidebar .search { padding: 0 15px 0 16px; } + .sidebar .search form { - width: 167px; - height: 21px; - padding: 2px 0 0 5px; - background: url(../images/form_bg.png) no-repeat 0 0; + background: url(../images/sprites-combined.png) no-repeat -6px -348px; + height:21px; + padding:2px 0 0 5px; + width:167px; } - .sidebar .search form fieldset input#searchstring + + .sidebar .search form input#pageType { width: 158px; height: 19px; @@ -403,32 +239,62 @@ outline: none; font: 13px/1.2 Verdana; } + .sidebar .box { padding: 17px 15px 5px 16px; } + .sidebar .box .first { background-image: none; } + .sidebar .box h2 { font: normal 18px/1.2 Arial; - padding: 15px 0 0 40px; + padding: 0; min-height: 32px; } + .sidebar .box h2 span + { + overflow: hidden; + display: inline-block; + } .sidebar .box#lookup h2 { - background: url(../images/api_lookup.png) no-repeat 0 0; + background-image: none; + } + .sidebar #lookup.box h2 span + { + background: url(../images/sprites-combined.png) no-repeat -6px -311px; + width: 27px; + height: 35px; + margin-right: 13px; } .sidebar .box#topics h2 { - background: url(../images/api_topics.png) no-repeat 0 0; + background-image: none; + } + .sidebar #topics.box h2 span + { + background: url(../images/sprites-combined.png) no-repeat -94px -311px; + width: 27px; + height: 32px; + margin-right: 13px; } .sidebar .box#examples h2 { - background: url(../images/api_examples.png) no-repeat 0 0; + background-image: none; + } + .sidebar #examples.box h2 span + { + background: url(../images/sprites-combined.png) no-repeat -48px -311px; + width: 30px; + height: 31px; + margin-right: 9px; } + .sidebar .box .list { display: block; @@ -443,6 +309,9 @@ { text-decoration: underline; } + .sidebar .box ul + { + } .sidebar .box ul li { padding-left: 12px; @@ -453,23 +322,20 @@ { background: url(../images/box_bg.png) repeat-x 0 bottom; } - /* content elements */ .wrap { - overflow: hidden; + margin: 0 5px 0 208px; + overflow: visible; } .offline .wrap { margin: 0 5px 0 5px; } - /* tool bar */ .wrap .toolbar { background-color: #fafafa; border-bottom: 1px solid #d1d1d1; - height: 20px; - margin-left: 3px; - margin-right: 5px; + height: 20px; position: relative; } .wrap .toolbar .toolblock @@ -487,7 +353,7 @@ { padding: 0 0 10px 21px; right: 5px; - vertical-align: top; + vertical-align: middle; overflow: hidden; } .wrap .toolbar .toolbuttons .active @@ -507,32 +373,56 @@ font-weight: bold; color: #B0ADAB; } - #smallA + + .toolbuttons #print + { + border-left: 1px solid #c5c4c4; + margin-top: 0; + padding-left: 7px; + text-indent: 0; + } + .toolbuttons #print a + { + width: 16px; + height: 16px; + } + + .toolbuttons #print a span + { + width: 16px; + height: 16px; + text-indent: -999em; + display: block; + overflow: hidden; + background: url(../images/sprites-combined.png) no-repeat -137px -311px; + } + + .toolbuttons #smallA { font-size: 10pt; } - #medA + .toolbuttons #medA { font-size: 12pt; } - #bigA + .toolbuttons #bigA { font-size: 14pt; + margin-right: 7px; } + #smallA:hover, #medA:hover, #bigA:hover { color: #00732F; } - #print + + .offline .wrap .breadcrumb { - font-size: 14pt; - line-height: 20pt; } - #printIcon + + .wrap .breadcrumb ul { - margin-left: 5px; } - /* bread crumbs */ .wrap .breadcrumb ul li { float: left; @@ -545,6 +435,10 @@ { font-weight: normal; } + .wrap .breadcrumb ul li a + { + color: #363534; + } .wrap .breadcrumb ul li.first { background-image: none; @@ -554,29 +448,29 @@ .wrap .content { padding: 30px; - position: relative; } - /* text elements */ - .heading + + .wrap .content li { - font: normal 600 16px/1.0 Arial; - padding-bottom: 15px; + padding-left: 12px; + background: url(../images/bullet_sq.png) no-repeat 0 5px; + font: normal 400 10pt/1 Verdana; + color: #44a51c; + margin-bottom: 10px; } - - .subtitle + .content li:hover { - font-size: 13px; + text-decoration: underline; } - .small-subtitle + .offline .wrap .content { - font-size: 13px; + padding-top: 15px; } - + .wrap .content h1 { font: 600 18px/1.2 Arial; - padding-bottom: 15px; } .wrap .content h2 { @@ -588,26 +482,13 @@ } .wrap .content p { - line-height:20px; - padding:10px 5px 10px 5px; + line-height: 20px; + padding: 10px 5px 10px 5px; } .wrap .content ul { padding-left: 25px; } - .wrap .content li - { - padding-left: 12px; - background: url(../images/bullet_sq.png) no-repeat 0 5px; - font: normal 400 10pt/1 Verdana; - margin-bottom: 10px; - line-height: 14px; - } - a - { - color: #00732F; - text-decoration: none; - } a:hover { color: #4c0033; @@ -618,10 +499,6 @@ color: #4c0033; text-decoration: none; } - .offline .wrap .content - { - padding-top: 15px; - } .footer { min-height: 100px; @@ -629,11 +506,15 @@ font: normal 9px/1 Verdana; text-align: center; padding-top: 40px; + background-color: #E6E7E8; + margin: 0; } .feedback { - float: right; - padding-right: 10px; + float: none; + position: absolute; + right: 15px; + bottom: 10px; font: normal 8px/1 Verdana; color: #B0ADAB; } @@ -644,37 +525,223 @@ color: #00732F; text-decoration: underline; } + .header:after, .footer:after, .breadcrumb:after, .wrap .content:after, .group:after + { + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; + } + #nav-topright + { + height: 70px; + } + + #nav-topright ul + { + list-style-type: none; + float: right; + width: 370px; + margin-top: 11px; + } + + #nav-topright li + { + display: inline-block; + margin-right: 20px; + float: left; + } + + #nav-topright li.nav-topright-last + { + margin-right: 0; + } + + #nav-topright li a + { + background: transparent url(../images/sprites-combined.png) no-repeat; + height: 18px; + display: block; + overflow: hidden; + text-indent: -9999px; + } + + #nav-topright li.nav-topright-home a + { + width: 65px; + background-position: -2px -91px; + } + + #nav-topright li.nav-topright-home a:hover + { + background-position: -2px -117px; + } + + + #nav-topright li.nav-topright-dev a + { + width: 30px; + background-position: -76px -91px; + } + + #nav-topright li.nav-topright-dev a:hover + { + background-position: -76px -117px; + } + + + #nav-topright li.nav-topright-labs a + { + width: 40px; + background-position: -114px -91px; + } + + #nav-topright li.nav-topright-labs a:hover + { + background-position: -114px -117px; + } + + #nav-topright li.nav-topright-doc a + { + width: 32px; + background-position: -162px -91px; + } + + #nav-topright li.nav-topright-doc a:hover, #nav-topright li.nav-topright-doc-active a + { + background-position: -162px -117px; + } + + #nav-topright li.nav-topright-blog a + { + width: 40px; + background-position: -203px -91px; + } + + #nav-topright li.nav-topright-blog a:hover, #nav-topright li.nav-topright-blog-active a + { + background-position: -203px -117px; + } + + #nav-topright li.nav-topright-shop a + { + width: 40px; + background-position: -252px -91px; + } + + #nav-topright li.nav-topright-shop a:hover, #nav-topright li.nav-topright-shop-active a + { + background-position: -252px -117px; + } + + #nav-logo + { + background: transparent url(../images/sprites-combined.png ) no-repeat 0 -225px; + left: -3px; + position: absolute; + width: 75px; + height: 75px; + top: 13px; + } + #nav-logo a + { + width: 75px; + height: 75px; + display: block; + text-indent: -9999px; + overflow: hidden; + } + + + .shortCut-topleft-inactive + { + padding-left: 3px; + background: transparent url( ../images/sprites-combined.png) no-repeat 0px -58px; + height: 20px; + width: 47px; + } + .shortCut-topleft-inactive span + { + font-variant: normal; + } + #shortCut + { + padding-top: 10px; + font-weight: bolder; + color: #b0adab; + } + #shortCut ul + { + list-style-type: none; + float: left; + width: 347px; + margin-left: 100px; + } + #shortCut li + { + display: inline-block; + margin-right: 25px; + float: left; + white-space: nowrap; + } + #shortCut li a + { + color: #b0adab; + } + #shortCut li a:hover + { + color: #44a51c; + } + hr { - background-color: #e0e0e0; + background-color: #E6E6E6; + border: 1px solid #E6E6E6; height: 1px; width: 100%; text-align: left; margin: 15px 0px 15px 0px; } - + .content .alignedsummary { margin: 15px; } - /* tables */ + pre + { + border: 1px solid #DDDDDD; + margin: 0 20px 10px 10px; + padding: 20px 15px 20px 20px; + overflow-x: auto; + } table, pre { -moz-border-radius: 7px 7px 7px 7px; background-color: #F6F6F6; border: 1px solid #E6E6E6; border-collapse: separate; - font-size: 11px; - min-width: 395px; + font-size: 11px; + /*min-width: 395px;*/ margin-bottom: 25px; + display: inline-block; + } + thead + { + margin-top: 5px; + } + th + { + padding: 3px 15px 3px 15px; + } + td + { + padding: 3px 15px 3px 20px; } - thead{margin-top: 5px;} - th{ padding: 3px 15px 3px 15px;} - td{padding: 3px 15px 3px 20px;} table tr.odd { border-left: 1px solid #E6E6E6; - background-color: #F6F6F6; + background-color: #F6F6F6; color: #66666E; } table tr.even @@ -685,12 +752,13 @@ } table tr.odd:hover { - background-color: #E6E6E6; + background-color: #E6E6E6; } table tr.even:hover { background-color: #E6E6E6; } + span.comment { color: #8B0000; @@ -700,15 +768,7 @@ { color: #254117; } - pre - { - -moz-border-radius:7px 7px 7px 7px; - background-color:#F6F6F6; - border:1px solid #DDDDDD; - margin:0 20px 10px 10px; - padding:20px 15px 20px 20px; - overflow-x:auto; - } + .qmltype { text-align: center; @@ -719,13 +779,28 @@ float: right; color: #254117; } + + .qmldefault + { + float: right; + color: red; + } + + .qmldoc + { + } + + *.qmlitem p + { + } + #feedbackBox { - display:none; - -moz-border-radius:7px 7px 7px 7px; - border:1px solid #DDDDDD; - position:fixed; - top:100px; + display: none; + -moz-border-radius: 7px 7px 7px 7px; + border: 1px solid #DDDDDD; + position: fixed; + top: 100px; left: 33%; height: 190px; width: 400px; @@ -735,27 +810,27 @@ } #feedcloseX a { - display:inline; + display: inline; padding: 5px 5px 0 0; - margin-bottom:3px; + margin-bottom: 3px; color: #363534; - font-weight:600; + font-weight: 600; float: right; text-decoration: none; } + #feedbox - /* here */ { - display:inline; + display: inline; width: 370px; height: 120px; - margin:0px 25px 10px 15px; + margin: 0px 25px 10px 15px; } #feedsubmit { - display:inline; - float:right; - margin:4px 32px 0 0; + display: inline; + float: right; + margin: 4px 32px 0 0; } #blurpage { @@ -771,141 +846,172 @@ } .toc { - float: right; - -moz-border-radius:7px 7px 7px 7px; - background-color:#F6F6F6; - border:1px solid #DDDDDD; - margin:0 20px 10px 10px; - padding:20px 15px 20px 20px; + float: right; + -moz-border-radius: 7px 7px 7px 7px; + background-color: #F6F6F6; + border: 1px solid #DDDDDD; + margin: 0 20px 10px 10px; + padding: 20px 15px 20px 20px; height: auto; width: 200px; } - .toc ul + .toc h3 { - float: left; - padding: 15px; - + font: 600 12px/1.2 Arial; + } + + .wrap .content .toc ul + { + padding-left: 0px; + } + + + .wrap .content .toc .level2 + { + margin-left: 15px; } - .content .toc li { - font: normal 12px/1.2 Verdana; + font: normal 10px/1.2 Verdana; background: url(../images/bullet_dn.png) no-repeat 0 5px; } - .relpage + .relpage { -moz-border-radius: 7px 7px 7px 7px; border: 1px solid #DDDDDD; padding: 25px 25px; - clear:both; + clear: both; } .relpage ul { float: none; padding: 15px; } - .content .relpage li + .content .relpage li { font: normal 11px/1.2 Verdana; } - /* edit */ h3.fn, span.fn { background-color: #F6F6F6; border-width: 1px; border-style: solid; border-color: #E6E6E6; - font-weight: bold; - /* padding: 6px 0px 6px 10px;*/ - /* margin: 42px 0px 0px 0px;*/ + font-weight: bold; } - /* edit */ - .indexbox - { - width: 100%; - } - .content .indexboxcont li - { - font: normal 600 13px/1 Verdana; - } - /* .indexbox a - { - color: #00732f; - text-decoration: none; - }*/ - .indexbox a:hover, .indexbox a:visited:hover - { - color: #4c0033; - text-decoration: underline; - } - .indexbox a:visited + /* start index box */ + .indexbox { - color: #00732f; - text-decoration: none; + width: 100%; + display:inline-block; } .indexboxcont { display: block; + /* overflow: hidden;*/ } .indexboxbar { - background: transparent url( "../images/horBar.png" ) repeat-x left bottom; + background: transparent url(../images/horBar.png ) repeat-x left bottom; margin-bottom: 25px; + /* background-image: none; + border-bottom: 1px solid #e2e2e2;*/ } .indexboxcont .section { - display: inline-block; + display: inline-block; width: 49%; *width:42%; _width:42%; padding:0 2% 0 1%; vertical-align:top; + } .indexboxcont .indexIcon - { + { width: 11%; *width:18%; _width:18%; overflow:hidden; + } .indexboxcont .section p - { + { padding-top: 20px; padding-bottom: 20px; } - .indexboxcont .sectionlist { display: inline-block; width: 33%; - margin-right: -2px; - vertical-align: top; padding: 0; } - .tricol - { - - } .indexboxcont .sectionlist ul { - padding-left: 15px; margin-bottom: 20px; } -/* + .indexboxcont .sectionlist ul li { line-height: 12px; } -*/ + + .content .indexboxcont li + { + font: normal 600 13px/1 Verdana; + } + + .indexbox a:hover, .indexbox a:visited:hover + { + color: #4c0033; + text-decoration: underline; + } + + .indexbox a:visited + { + color: #00732f; + text-decoration: none; + } + + .indexboxcont:after + { + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; + } + + .indexbox .indexIcon span + { + display: block; + } + + .indexbox.guide .indexIcon span + { + width: 96px; + height: 137px; + background: url(../images/sprites-combined.png) no-repeat -5px -376px; + padding: 0; + } + + .indexbox.tools .indexIcon span + { + width: 115px; + height: 137px; + background: url(../images/sprites-combined.png) no-repeat -111px -376px; + padding: 0; + } + .lastcol { display: inline-block; @@ -916,12 +1022,9 @@ .tricol .lastcol { - margin-left:-6px; + margin-left: -6px; } - - /*.toc ul*/ - - /* end page elements */ + /* end indexbox */ } /* end of screen media */ @@ -929,7 +1032,7 @@ @media print { - .header, .footer, .toolbar, .feedback, .wrapper .hd, .wrapper .bd .sidebar, .wrapper .ft + input, textarea, .header, .footer, .toolbar, .feedback, .wrapper .hd, .wrapper .bd .sidebar, .wrapper .ft { display: none; background: none; -- cgit v0.12