From 7f3e4db6d82d1f409a6be2077ff05c10efcf5443 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Tue, 15 Jun 2010 14:45:14 +0200 Subject: [PATCH] Sync doc style with Qt, introduce online version (make docs_online) The spacing errors come from Qt, and should be fixed there. Reviewed-By: Oswald Buddenhagen (cherry picked from commit c7db4a09c8c3cb5de203a3f2d9e43d690b67e73a) --- doc/doc.pri | 22 +++++--- doc/qt-defines.qdocconf | 77 +++++++++++++--------------- doc/qt-html-templates.qdocconf | 38 +++++++------- doc/qtcreator-online.qdocconf | 4 ++ doc/qtcreator.qdocconf | 17 ++---- doc/templates/images/arrow_down.png | Bin 0 -> 177 bytes doc/templates/images/header_bg.png | Bin 0 -> 114 bytes doc/templates/images/page.png | Bin 0 -> 3102 bytes doc/templates/images/spinner.gif | Bin 0 -> 2037 bytes doc/templates/style/style.css | 2 +- 10 files changed, 80 insertions(+), 80 deletions(-) create mode 100644 doc/qtcreator-online.qdocconf create mode 100644 doc/templates/images/arrow_down.png create mode 100644 doc/templates/images/header_bg.png create mode 100644 doc/templates/images/page.png create mode 100644 doc/templates/images/spinner.gif diff --git a/doc/doc.pri b/doc/doc.pri index b4c8800f634..c161582f7f8 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -15,10 +15,20 @@ equals(QMAKE_DIR_SEP, /) { # unix, mingw+msys QHP_FILE = $$OUT_PWD/doc/html/qtcreator.qhp QCH_FILE = $$IDE_DOC_PATH/qtcreator.qch +HELP_DEP_FILES = $$PWD/qtcreator.qdoc \ + $$PWD/addressbook-sdk.qdoc \ + $$PWD/qt-defines.qdocconf \ + $$PWD/qt-html-templates.qdocconf \ + $$PWD/qtcreator.qdocconf \ + $$PWD/qtcreator-online.qdocconf + html_docs.commands = $$QDOC $$PWD/qtcreator.qdocconf -html_docs.depends += $$PWD/qtcreator.qdoc $$PWD/qtcreator.qdocconf +html_docs.depends += $$HELP_DEP_FILES html_docs.files = $$QHP_FILE +html_docs_online.commands = $$QDOC $$PWD/qtcreator-online.qdocconf +html_docs_online.depends += $$HELP_DEP_FILES + qch_docs.commands = $$HELPGENERATOR -o \"$$QCH_FILE\" $$QHP_FILE qch_docs.depends += html_docs qch_docs.files = $$QCH_FILE @@ -29,10 +39,10 @@ unix:!macx { INSTALLS += qch_docs } +docs_online.depends = html_docs_online docs.depends = qch_docs -QMAKE_EXTRA_TARGETS += html_docs qch_docs docs +QMAKE_EXTRA_TARGETS += html_docs html_docs_online qch_docs docs docs_online -OTHER_FILES = $$PWD/qtcreator.qdoc \ - $$PWD/qtcreator.qdocconf -OTHER_FILES += $$PWD/api/qtcreator-api.qdoc \ - $$PWD/api/qtcreator-api.qdocconf +OTHER_FILES = $$HELP_DEP_FILES \ + $$PWD/api/qtcreator-api.qdoc \ + $$PWD/api/qtcreator-api.qdocconf diff --git a/doc/qt-defines.qdocconf b/doc/qt-defines.qdocconf index f3239272c78..67d8e0348ce 100644 --- a/doc/qt-defines.qdocconf +++ b/doc/qt-defines.qdocconf @@ -20,53 +20,46 @@ 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 \ - header.png \ - qtcreator-screenshots.png \ - taskmenuextension-example.png \ - coloreditorfactoryimage.png \ - dynamiclayouts-example.png \ - stylesheet-coffee-plastique.png + 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_dn.png \ + bullet_gt.png \ + bullet_sq.png \ + box_bg.png \ + feedbackground.png \ + horBar.png \ + page_bg.png \ + sprites-combined.png \ + 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 = OfflineStyle.css \ - style.css \ - style_ie6.css \ - style_ie7.css \ - style_ie8.css +styles.HTML = style.css \ + shCore.css \ + shThemeDefault.css \ + narrow.css \ + superfish.css \ + superfish_skin.css \ + OfflineStyle.css \ + style_ie6.css \ + style_ie7.css \ + style_ie8.css diff --git a/doc/qt-html-templates.qdocconf b/doc/qt-html-templates.qdocconf index edc75f1aa20..0f7ec3e94bc 100644 --- a/doc/qt-html-templates.qdocconf +++ b/doc/qt-html-templates.qdocconf @@ -1,8 +1,8 @@ HTML.stylesheets = style/style.css \ - style/OfflineStyle.css \ - style/style_ie7.css \ - style/style_ie8.css \ - style/style_ie6.css + style/OfflineStyle.css \ + style/style_ie7.css \ + style/style_ie8.css \ + style/style_ie6.css HTML.postheader = "
\n" \ "
\n" \ @@ -54,12 +54,12 @@ HTML.postheader = "
\n" \ " API Lookup\n" \ "
\n" \ " \n" \ "
\n" \ "
\n" \ @@ -68,10 +68,10 @@ HTML.postheader = "
\n" \ " Qt Topics\n" \ " \n" \ "
\n" \ @@ -80,11 +80,11 @@ HTML.postheader = "
\n" \ " Examples\n" \ "
\n" \ " \n" \ "
\n" \ "
\n" \ diff --git a/doc/qtcreator-online.qdocconf b/doc/qtcreator-online.qdocconf new file mode 100644 index 00000000000..adfa30760be --- /dev/null +++ b/doc/qtcreator-online.qdocconf @@ -0,0 +1,4 @@ +online = true +# Run qdoc from the directory that contains this file. +include(qtcreator.qdocconf) + diff --git a/doc/qtcreator.qdocconf b/doc/qtcreator.qdocconf index 02624c66c61..bded10f86a8 100644 --- a/doc/qtcreator.qdocconf +++ b/doc/qtcreator.qdocconf @@ -38,30 +38,23 @@ qhp.QtCreator.extraFiles = \ scripts/jquery.js \ images/api_examples.png \ images/api_lookup.png \ - images/api_topics.png \ + images/arrow_down.png \ images/bg_ll.png \ - images/bg_l_blank.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/bg_ll_blank.png \ + images/bg_l_blank.png \ images/breadcrumb.png \ images/bullet_dn.png \ images/bullet_gt.png \ + images/bullet_sq.png \ + images/box_bg.png \ images/feedbackground.png \ - images/form_bg.png \ images/horBar.png \ images/page_bg.png \ - images/print.png \ - images/qt_guide.png \ images/qt-logo.png \ - images/qt_ref_doc.png \ - images/qt_tools.png \ - images/sep.png \ - images/header.png \ images/sprites-combined.png # macros.qdocconf diff --git a/doc/templates/images/arrow_down.png b/doc/templates/images/arrow_down.png new file mode 100644 index 0000000000000000000000000000000000000000..9d01e97f6a959434811ae2bc02107903f47734f8 GIT binary patch literal 177 zcmeAS@N?(olHy`uVBq!ia0y~yU;wdMIhYt27(TPTvS(mmkSuYHC<)F_D=AMbN@Z|N z$xljE@XSq2PYp^~2Z$n><~PvqvbLuVUKH(LBpWXR~Axw3Qq`tz5U`#)^r$W(~fRl>PR eMu34uf}xqympOEbxjX{{1B0ilpUXO@geCy*C_pX% literal 0 HcmV?d00001 diff --git a/doc/templates/images/header_bg.png b/doc/templates/images/header_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..a436aa61eff96c18f4fbb6e050d79f8d8da6146a GIT binary patch literal 114 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 literal 0 HcmV?d00001 diff --git a/doc/templates/images/spinner.gif b/doc/templates/images/spinner.gif new file mode 100644 index 0000000000000000000000000000000000000000..1ed786f2ece49ec5db07dee13a56ef38025b628c GIT binary patch literal 2037 zcmZ?wbhEHb6krfwc*el+|NsAg|Nbpry!h|mzb{|D+`4t^&!0bk{rdIw>(@Vj{;XcT z`t94d2M!$AxN+n0=`pN^OGk}?%%(EZrZfz_U+rNR;{{u^XB#I*LUyU zt)`}S_UzdkH*W0QxpUsUd8bdGUbk-D@87@Qym=E86!hxVtJc=mZ{NOod3oKrbBBkA z=iJp3z3nLX=!PvPMun|Y}tno zA09k-uw%!L{rmU7c=6)%=g%ijoT#d*TDo-UzJ2@r{QM3dK78!hv7<+iiin70Wo6yH zd-unWAJ?v3+qG-go;`aeOqh_DmnS15bMM~0Y15`PH8u70^mKN1CMG79l$3;ogtWJ} zPo6y4&CRW^uP;12yuQBP$jGR?y!_U!TQxN`W@cuEg@ulejyX9wQ>IL*sHj-DaN(jw zi*$8$m6eqn8X7KLy0m7^8pZ$Iey$RoReKwwVS~=-;NNSBZI0IgMz|? zBi&5=EIEu5o*Xe@VDoU{n2^ZApdDxuqqN`wBLg27lR`t|qacPvhOi|a=?W7UIG}ot zmw}ssfjuAMIq8zt<|gq13x@b&<|uQYW+S^ihIDy`axp#zeklf-44D9Pb+M9`q+~~- zB0Vb}1uY{{22rM>Bq8=Db|r77=I9v4E(Td0M|&q$+fxhze8RlEtiG3(bep*oPj*R& zGq8zxC>ox!XKF-sg8%~u0|R>s#0^|2t<7Bwwn_X9scFo9cCpO)Ic{@oLb_P| z7+eBmr6V+KOc~fB8JPtY3fZJ%Bpi9OjbvRdr5L1mm;~7jn>YoE#PV4go5fu&bY+$| zYx4+)a!>b__Th0yvY45Hfq|ESi-CbXy@7#|fg#9&xuuiAh?RxGBa@jU*`(m zm4PYPs!O6uLpjC5SdT$Kg3*FKCPZArr_3lUxYUfv$&j;!lOxZ@*q%|`rMXMmp)-`b zt3^CBCCPx*_X2~3yp2{ccjC!T#n?_HyFp2dn}LskfxWVUfx*g$v8kPbn?Xj6QAkg= zU6Vo5fk8LGqMb>OuTs2-mBCDoF-FA5!ZFTMB;L-tU<~5aFe6j-0I&R|S;ki*v>iVqwRY45V(wu^flFAHWfn7~V zuHj%{WZ+=nXJBAYYT#mI*HvX`S7s1l5^ZNtG_uxbh!SVyk5u$4%t|(6U}jSeNYd$J zknvyM&Mlp4s@G>55MP$s#~QYpF-#jjFq8Kg}KwNhNZ7bJmGA+ zCL@CqXCIQaYz#~cT;M>+ZD5cD*=WnqDaQx4lbwZ8#E3rhjsi)f8%Z9{Sf0|N&GBnzZA2=nqfXfU*QfD3^R5hmu2 zb_wyx&H$s!7beZz)Gn(NU~HV`*xoL{ zSL>SVDmkG^Nw-}`rEP+QID>Oab*a!ydnRVLnpE4QdTt|)SPmTq_ZhOr-ileOmC+Lf z;!7A6QW@+6rP{^av>7~18I=q)+8I|eXzI1GaiUnv%)rgS%fP^1)WF~`!C=J%j(BFf za6P36Nl?r)_~z6U`x%0wWIh953iIOmaS`zavMc6SWSeKWuV10cvwXdPN3I*&dgi=f zJ#JneXJ@Zi1`!bki2yzyR(__%W^q}J_R0)li}_8}8HBkQITkYt&DYjsWI%BSDC|Kg zKM_>;a5h;rTjaOPG&|RnGDtFL$T5V9De^KK7jtoB1gKAr(8}OoZ)T8*V{WoeP03Pi zPKk&}*I3yk?!wqCq?wnxf`M5&fYnn{R)C?dkinKoUB8)4MUZh)6AKsrszwHD0O;6f A6#xJL literal 0 HcmV?d00001 diff --git a/doc/templates/style/style.css b/doc/templates/style/style.css index 47fe2e0a04a..28d558f847e 100644 --- a/doc/templates/style/style.css +++ b/doc/templates/style/style.css @@ -678,7 +678,7 @@ padding-left: 3px; background: transparent url( ../images/sprites-combined.png) no-repeat 0px -58px; height: 20px; - width: 47px; + width: 110px; } .shortCut-topleft-inactive span {