Skip to content
Snippets Groups Projects
Commit 9476add6 authored by Morten Engvoldsen's avatar Morten Engvoldsen
Browse files

Doc: Updated qdocconf files, style and template.

parent eb498ee4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
doc/qt-defines.qdocconf
+ 20
− 28
View file @ 9476add6
......@@ -22,48 +22,40 @@ codeindent = 1
# See also qhp.Qt.extraFiles
extraimages.HTML = qt-logo \
trolltech-logo \
api_examples.png \
api_lookup.png \
arrow_down.png \
bg_ll.png \
bg_l.png \
bg_lr.png \
bg_r.png \
bg_ul_blank.png \
bg_ll_blank.png \
bg_l_blank.png \
breadcrumb.png \
bullet_up.png \
bullet_dn.png \
bullet_gt.png \
bullet_sq.png \
box_bg.png \
feedbackground.png \
horBar.png \
page_bg.png \
page.png \
sprites-combined.png \
qtcreator-screenshots.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 \
qtcreator-screenshots.png
# This stuff is used by the new doc format.
scriptdirs = $SRCDIR/templates/scripts
styledirs = $SRCDIR/templates/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
doc/qt-html-templates.qdocconf
+ 48
− 11
View file @ 9476add6
......@@ -11,27 +11,58 @@ HTML.postheader = " <div class=\"header\" id=\"qtdocheader\">\n" \
" <a href=\"index.html\" class=\"qtref\"><span>Qt Creator 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" \
" <input type=\"text\" value=\"\" id=\"pageType2\" 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" \
" <li class=\"nav-topright-dev\"><a href=\"http://qt.nokia.com/developer\">DEV</a></li>\n" \
" <li class=\"nav-topright-dev\"><a href=\"http://developer.qt.nokia.com/\">DEV</a></li>\n" \
" <li class=\"nav-topright-labs\"><a href=\"http://labs.qt.nokia.com/blogs/\">LABS</a></li>\n" \
" <li class=\"nav-topright-doc nav-topright-doc-active\"><a href=\"http://doc.qt.nokia.com/\">\n" \
" DOC</a></li>\n" \
" <li class=\"nav-topright-blog\"><a href=\"http://blog.qt.nokia.com/\">BLOG</a></li>\n" \
" <li class=\"nav-topright-shop\"><a title=\"SHOP\" href=\"http://shop.qt.nokia.com\">SHOP</a></li>\n" \
" <li class=\"nav-topright-dev\"><a href=\"http://developer.qt.nokia.com/\">DEV</a></li>\n" \
" </ul>\n" \
" </div>\n" \
" <div id=\"shortCut\">\n" \
" <ul>\n" \
" <li class=\"shortCut-topleft-inactive\"><span><a href=\"index.html\">Qt Creator 2.0.90 </a></span></li>\n" \
" <li class=\"shortCut-topleft-active\"><a href=\"http://qt.nokia.com/doc/\">ALL VERSIONS" \
" <li class=\"shortCut-topleft-active\"><a href=\"http://doc.qt.nokia.com\">ALL VERSIONS" \
" </a></li>\n" \
" </ul>\n" \
" </div>\n" \
" </div>\n" \
" </div>\n" \
" <div class=\"wrapper\">\n" \
......@@ -58,7 +89,7 @@ HTML.postheader = " <div class=\"header\" id=\"qtdocheader\">\n" \
" <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/functions.html\">Function index</a></li>\n" \
" <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/modules.html\">Modules</a></li>\n" \
" <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/namespaces.html\">Namespaces</a></li>\n" \
" <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/qtglobal.html\">Global stuff</a></li>\n" \
" <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/qtglobal.html\">Global Declarations</a></li>\n" \
" <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/qdeclarativeelements.html\">QML elements</a></li>\n" \
" </ul> \n" \
" </div>\n" \
......@@ -68,10 +99,13 @@ HTML.postheader = " <div class=\"header\" id=\"qtdocheader\">\n" \
" Qt Topics</h2>\n" \
" <div id=\"list002\" class=\"list\">\n" \
" <ul id=\"ul002\" >\n" \
" <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/qt-basic-concepts.html\">Basic Qt architecture</a></li>\n" \
" <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/declarativeui.html\">Device UI's &amp; Qt Quick</a></li>\n" \
" <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/qt-gui-concepts.html\">Desktop UI components</a></li>\n" \
" <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/platform-specific.html\">Platform-specific info</a></li>\n" \
" <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/qt-basic-concepts.html\">Programming with Qt</a></li> \n" \
" <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/qtquick.html\">Device UI's &amp; Qt Quick</a></li> \n" \
" <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/qt-gui-concepts.html\">UI Design with Qt</a></li> \n" \
" <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/developing-with-qt.html\">Cross-platform and Platform-specific</a></li> \n" \
" <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/platform-specific.html\">Platform-specific info</a></li> \n" \
" <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/technology-apis.html\">Qt and Key Technologies</a></li> \n" \
" <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/best-practices.html\">How-To's and Best Practices</a></li> \n" \
" </ul> \n" \
" </div>\n" \
" </div>\n" \
......@@ -84,7 +118,6 @@ HTML.postheader = " <div class=\"header\" id=\"qtdocheader\">\n" \
" <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/tutorials.html\">Tutorials</a></li>\n" \
" <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/demos.html\">Demos</a></li>\n" \
" <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/qdeclarativeexamples.html\">QML Examples</a></li>\n" \
" <li class=\"defaultLink\"><a href=\"http://doc.qt.nokia.com/latest/qdeclarativeexamples.html#Demos\">QML Demos</a></li>\n" \
" </ul> \n" \
" </div>\n" \
" </div>\n" \
......@@ -119,6 +152,7 @@ HTML.footer = " <!-- /div -->\n" \
" <span></span>\n" \
" </div>\n" \
" </div> \n" \
" <div class=\"footer\">\n" \
" <p>\n" \
" <acronym title=\"Copyright\">&copy;</acronym> 2008-2010 Nokia Corporation and/or its\n" \
......@@ -131,12 +165,15 @@ HTML.footer = " <!-- /div -->\n" \
" <div id=\"feedbackBox\">\n" \
" <div id=\"feedcloseX\" class=\"feedclose t_button\">X</div>\n" \
" <form id=\"feedform\" action=\"http://doc.qt.nokia.com/docFeedbck/feedback.php\" method=\"get\">\n" \
" <p><textarea id=\"feedbox\" name=\"feedText\" rows=\"5\" cols=\"40\">Please submit you feedback...</textarea></p>\n" \
" <p id=\"noteHead\">Thank you for giving your feedback. <div class=\"note\">Make sure it is related to this specific page. For more general bugs and \n" \
" requests, please use the <a href=\"http://bugreports.qt.nokia.com/secure/Dashboard.jspa\">Qt Bug Tracker</a>.</div></p>\n" \
" <p><textarea id=\"feedbox\" name=\"feedText\" rows=\"5\" cols=\"40\"></textarea></p>\n" \
" <p><input id=\"feedsubmit\" class=\"feedclose\" type=\"submit\" name=\"feedback\" /></p>\n" \
" </form>\n" \
" </div>\n" \
" <div id=\"blurpage\">\n" \
" </div>\n" \
"<script type=\"text/javascript\">\n" \
" var _gaq = _gaq || [];\n" \
" _gaq.push([\'_setAccount\', \'UA-4457116-5\']);\n" \
......
doc/qtcreator.qdocconf
+ 11
− 17
View file @ 9476add6
# Run qdoc from the directory that contains this file.
include(qt-html-templates.qdocconf)
......@@ -26,34 +27,27 @@ qhp.QtCreator.filterAttributes = qtcreator 2.0.90
qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 2.0.90
qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 2.0.90
qhp.QtCreator.indexRoot =
qhp.QtCreator.extraFiles = \
style/style.css \
qhp.QtCreator.extraFiles = style/style.css \
style/style_ie6.css \
style/style_ie7.css \
style/style_ie8.css \
style/OfflineStyle.css \
style/narrow.css \
style/OfflineStyle.css \
style/superfish.css \
style/superfish_skin.css \
images/qt-logo.png \
images/qtcreator-screenshots.png \
scripts/functions.js \
scripts/jquery.js \
scripts/narrow.js \
scripts/superfish.js \
images/api_examples.png \
images/api_lookup.png \
scripts/narrow.js \
scripts/superfish.js \
style/narrow.css \
style/superfish.css \
images/qtcreator-screenshots.png \
images/arrow_down.png \
images/bg_ll.png \
images/header_bg.png \
images/bg_l.png \
images/bg_lr.png \
images/bg_r.png \
images/bg_ul_blank.png \
images/bg_ll_blank.png \
images/bg_l_blank.png \
images/breadcrumb.png \
images/bullet_dn.png \
images/bullet_up.png \
images/bullet_gt.png \
images/bullet_sq.png \
images/box_bg.png \
......@@ -62,8 +56,8 @@ qhp.QtCreator.extraFiles = \
images/page_bg.png \
images/page.png \
images/qt-logo.png \
images/sprites-combined.png \
images/bullet_up.png
images/spinner.gif \
images/sprites-combined.png
qhp.QtCreator.subprojects = manual
qhp.QtCreator.subprojects.manual.title = Qt Creator Manual
......
doc/templates/style/narrow.css
+ 3
− 0
View file @ 9476add6
......@@ -203,6 +203,9 @@
*border: 1px solid #fff;
*height: 17px;
_height: 18px;
/* to be fixed */
display: none;
/* to be fixed */
}
.narrow .indexbox .indexIcon {
......
doc/templates/style/style.css
+ 5
− 1
View file @ 9476add6
......@@ -388,9 +388,9 @@
.shortCut-topleft-inactive
{
padding-left: 3px;
padding-right: 3px;
background: transparent url( ../images/sprites-combined.png) no-repeat 0px -58px;
height: 20px;
width: 47px;
}
.shortCut-topleft-inactive span
{
......@@ -1521,6 +1521,10 @@
.creator .toc {
margin:10px 20px 10px 10px;
}
.creator #narrowsearch, .creator #narrowmenu{
display:none;
}
/* end of creator spec*/
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment