summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMorten Engvoldsen <morten.engvoldsen@nokia.com>2010-05-11 13:30:12 (GMT)
committerMorten Engvoldsen <morten.engvoldsen@nokia.com>2010-05-11 13:30:12 (GMT)
commit949f49c9ea4dadfc6e7f3bf7d822830b7ef8a8e6 (patch)
treeb859ac510e297bd9166839058398fa9ff548306d /doc
parent70dd6652b8f649871e6801cc9190543f43daa650 (diff)
downloadQt-949f49c9ea4dadfc6e7f3bf7d822830b7ef8a8e6.zip
Qt-949f49c9ea4dadfc6e7f3bf7d822830b7ef8a8e6.tar.gz
Qt-949f49c9ea4dadfc6e7f3bf7d822830b7ef8a8e6.tar.bz2
Doc: Fixed tables and images for the new docs
Added page.png to images dir. Fixed tables "generic"
Diffstat (limited to 'doc')
-rw-r--r--doc/src/getting-started/demos.qdoc7
-rw-r--r--doc/src/template/images/page.pngbin0 -> 3102 bytes
-rwxr-xr-xdoc/src/template/scripts/functions.js14
-rwxr-xr-xdoc/src/template/style/style.css39
4 files changed, 40 insertions, 20 deletions
diff --git a/doc/src/getting-started/demos.qdoc b/doc/src/getting-started/demos.qdoc
index 6974634..f8c70fe 100644
--- a/doc/src/getting-started/demos.qdoc
+++ b/doc/src/getting-started/demos.qdoc
@@ -53,15 +53,14 @@
\l{Qt Examples} and are used to highlight certain features of
Qt.
- \table 50%
+ \table
\header
\o {2,1} Getting an Overview
\row
\o \inlineimage qtdemo-small.png
- \o
- If you run the \l{Examples and Demos Launcher}, you'll see many of Qt's
+ \o If you run the \l{Examples and Demos Launcher}, you'll see many of Qt's
widgets in action.
-
+
The \l{Qt Widget Gallery} also provides overviews of selected Qt
widgets in each of the styles used on various supported platforms.
\endtable
diff --git a/doc/src/template/images/page.png b/doc/src/template/images/page.png
new file mode 100644
index 0000000..1db151b
--- /dev/null
+++ b/doc/src/template/images/page.png
Binary files differ
diff --git a/doc/src/template/scripts/functions.js b/doc/src/template/scripts/functions.js
index 2362bc4..09b7de3 100755
--- a/doc/src/template/scripts/functions.js
+++ b/doc/src/template/scripts/functions.js
@@ -50,7 +50,6 @@ function processNokiaData(response){
if(propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'APIPage'){
lookupCount++;
//$('.live001').css('display','block');
- $('#ul001 .defaultLink').css('display','none');
for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++){
@@ -58,13 +57,14 @@ function processNokiaData(response){
full_li_element = full_li_element + "'>" + propertyTags[i].getElementsByTagName('pageTitle')[0].firstChild.nodeValue + linkEnd;
$('#ul001').append(full_li_element);
+ $('#ul001 .defaultLink').css('display','none');
+
}
}
if(propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Article'){
articleCount++;
//$('.live002').css('display','block');
- $('#ul002 .defaultLink').css('display','none');
for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++){
@@ -72,12 +72,13 @@ function processNokiaData(response){
full_li_element =full_li_element + "'>" + propertyTags[i].getElementsByTagName('pageTitle')[0].firstChild.nodeValue + linkEnd ;
$('#ul002').append(full_li_element);
+ $('#ul002 .defaultLink').css('display','none');
+
}
}
if(propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Example'){
exampleCount++;
//$('.live003').css('display','block');
- $('#ul003 .defaultLink').css('display','none');
for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++){
@@ -85,6 +86,8 @@ function processNokiaData(response){
full_li_element =full_li_element + "'>" + propertyTags[i].getElementsByTagName('pageTitle')[0].firstChild.nodeValue + linkEnd ;
$('#ul003').append(full_li_element);
+ $('#ul003 .defaultLink').css('display','none');
+
}
}
}
@@ -122,6 +125,11 @@ function CheckEmptyAndLoadList()
$(document).ready(function () {
var pageTitle = $('title').html();
$('#feedform').append('<input id="page" name="pageVal" value="'+pageTitle+'" style="display:none;">');
+ var currentString = $('#pageType').val() ;
+ if(currentString.length < 1){
+ $('.defaultLink').css('display','block');
+ CheckEmptyAndLoadList();
+ }
$('#pageType').keyup(function () {
var searchString = $('#pageType').val() ;
diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 2e01af6..d87b11f 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -302,6 +302,9 @@
.sidebar .box .list
{
display: block;
+ max-height:200px;
+ overflow-y:auto;
+ overflow-x:none;
}
.sidebar .box .live
{
@@ -315,7 +318,7 @@
}
.sidebar .box ul
{
- padding:10px 0 0 10px;
+ padding:10px;
}
.sidebar .box ul li
{
@@ -488,8 +491,13 @@
.wrap .content p
{
line-height: 20px;
- padding: 5px 5px 5px 5px;
+ padding: 5px;
}
+ .wrap .content table p
+ {
+ line-height: 20px;
+ padding: 0px;
+ }
.wrap .content ul
{
padding-left: 25px;
@@ -743,20 +751,21 @@
thead
{
margin-top: 5px;
+ font:600 12px/1.2 Arial;
}
th
{
padding: 5px 15px 5px 15px;
background-color: #E1E1E1;
- border-bottom: 1px solid #E6E6E6;
+ /* border-bottom: 1px solid #E6E6E6;*/
border-left: 1px solid #E6E6E6;
- border-right: 1px solid #E6E6E6;
+ /* border-right: 1px solid #E6E6E6;*/
}
td
{
padding: 3px 15px 3px 20px;
- border-left: 1px solid #E6E6E6;
- border-right: 1px solid #E6E6E6;
+ /* border-left: 1px solid #E6E6E6;
+ border-right: 1px solid #E6E6E6;*/
}
tr.odd td:hover, tr.even td:hover
{
@@ -780,15 +789,11 @@
background-color: #ffffff;
color: #66666E;
}
- table tr.odd:hover
- {
- background-color: #E6E6E6;
- }
- table tr.even:hover
+ table tr.odd td:hover, table tr.even td:hover
{
background-color: #E6E6E6;
}
-
+
span.comment
{
color: #8B0000;
@@ -892,12 +897,20 @@
}
.generic{
- max-width:100%;
+ max-width:75%;
}
.generic td{
padding:0;
}
+ .generic .odd .alphaChar{
+ background-color: #F6F6F6;
+ }
+
+ .generic .even .alphaChar{
+ background-color: #FFFFFF;
+ }
+
.alignedsummary{}
.propsummary{}
.memItemLeft{}