diff --git a/dist/installer/ifw/config/background.png b/dist/installer/ifw/config/background.png new file mode 100644 index 00000000000..6819e274b39 Binary files /dev/null and b/dist/installer/ifw/config/background.png differ diff --git a/dist/installer/ifw/config/config-mac.xml.in b/dist/installer/ifw/config/config-mac.xml.in index 0a74e14c8a7..24abb21ef0f 100644 --- a/dist/installer/ifw/config/config-mac.xml.in +++ b/dist/installer/ifw/config/config-mac.xml.in @@ -7,7 +7,7 @@ http://qt-project.org logo.png - watermark.png + background.png Uninstall Qt Creator @homeDir@/Applications/Qt Creator {version} diff --git a/dist/installer/ifw/config/watermark.png b/dist/installer/ifw/config/watermark.png index fc44c44f4c6..10e25f5b066 100644 Binary files a/dist/installer/ifw/config/watermark.png and b/dist/installer/ifw/config/watermark.png differ diff --git a/doc/api/qtcreator-dev-online-qt4.qdocconf b/doc/api/qtcreator-dev-online-qt4.qdocconf deleted file mode 100644 index 3ba96b7aad1..00000000000 --- a/doc/api/qtcreator-dev-online-qt4.qdocconf +++ /dev/null @@ -1,4 +0,0 @@ -# Run qdoc from the directory that contains this file. -include(../config/compat.qdocconf) -include(../config/qtcreator-developer.qdocconf) -include(../config/qt-html-templates-online.qdocconf) diff --git a/doc/api/qtcreator-dev-qt4.qdocconf b/doc/api/qtcreator-dev-qt4.qdocconf deleted file mode 100644 index 8a3201ca20d..00000000000 --- a/doc/api/qtcreator-dev-qt4.qdocconf +++ /dev/null @@ -1,4 +0,0 @@ -# Run qdoc from the directory that contains this file. -include(../config/compat.qdocconf) -include(../config/qtcreator-developer.qdocconf) -include(../config/qt-html-templates.qdocconf) diff --git a/doc/api/qtcreator-documentation.qdoc b/doc/api/qtcreator-documentation.qdoc index 06a3693f75f..c97f952f3d5 100644 --- a/doc/api/qtcreator-documentation.qdoc +++ b/doc/api/qtcreator-documentation.qdoc @@ -150,6 +150,13 @@ You can illustrate your documentation by using screen shots, diagrams, and other images. + Use the \c {\image} and \c {\inlineimage} QDoc commands to refer to images + from the text. You do not need to add paths to image names. For example: + + \code + \image riot.png + \endcode + \section2 Taking Screen Shots \QC has the native look and feel on Windows, Linux, and OS X, and @@ -200,7 +207,11 @@ Before committing images, optimize them by using an image optimization tool. Optimization should not visibly reduce image quality. If it does, do not do - it. You can use the Radical Image Optimization Tool (RIOT) on Windows (very + it. + + You can use a web service, such as \l{https://tinypng.com}, or an image + optimization tool to shrink the images. For example, you + can use the Radical Image Optimization Tool (RIOT) on Windows (very efficient) or ImageOptim on OS X (much less efficient), or some other tool available on Linux. @@ -209,17 +220,6 @@ \section3 Using RIOT - Use the \c {\image} and \c {\inlineimage} QDoc commands to refer to images - from the text. You do not need to add paths to image names. For example: - - \code - - \image riot.png - - \endcode - - \section2 Optimizing Images - Download and install \l{http://luci.criosweb.ro/riot/}{RIOT}. \image riot.png @@ -255,18 +255,26 @@ The content and formatting of documentation are separated in QDoc. The documentation configuration, style sheets, and templates have - changed over time, so they differ between Qt and \QC versions. In Qt 4, - separate style sheets are used to generate help files for \QC and online - documentation for the Web. + changed over time, so they differ between Qt and \QC versions. Since \QC + version 3.3, only Qt 5 is supported for building documentation. The + templates to use are defined by the + \c qt5\qtbase\doc\global\qt-html-templates-offline.qdocconf} and + \c {qt5\qtbase\doc\global\qt-html-templates-online.qdocconf} configuration + file. They are fetched from Qt sources by adding the following lines to the + qdocconf file: - In Qt 5, only one set of templates is used, as defined by the - \c {qt5\qtbase\doc\global\qt-module-defaults.qdocconf} configuration file. - It is fetched from Qt sources by adding the following line to the qdocconf - file: + \list - \c {include ($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)} + \li \c {include ($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf)} + for publishing on the web + \li \c {include ($QT_INSTALL_DOCS/global/qt-html-templates-online.qdocconf)} + for help files + \endlist - To pick the Qt to use, run qmake from either Qt 4 or Qt 5. + \note If the styles look wrong to you when reading help files in \QC or \QA, + you might be looking at them in the QTextBrowser instead of the WebKit + browser. This happens if you build \QC and \QA with a self-built Qt and did + not build Qt WebKit. To build documentation for the sources from the qtcreator master branch, use build scripts defined in the doc.pri file. To build all \QC docs in the @@ -288,7 +296,7 @@ on OS X. You can view the HTML files in a browser and the help files in the \QC \gui Help mode. For more information about adding the help files to \QC, see - \l{http://qt-project.org/doc/qtcreator-2.8/creator-help.html#adding-external-documentation} + \l{http://qt-project.org/doc/qtcreator/creator-help.html#adding-external-documentation} {Adding External Documentation}. Besides \c docs, you have the following options: diff --git a/doc/config/compat.qdocconf b/doc/config/compat.qdocconf deleted file mode 100644 index fe793de6b81..00000000000 --- a/doc/config/compat.qdocconf +++ /dev/null @@ -1,31 +0,0 @@ -alias.i = e - -macro.li = "\\o" -macro.0 = "\\\\0" -macro.b = "\\bold" -macro.n = "\\\\n" -macro.r = "\\\\r" -macro.i = "\\o" -macro.i11 = "\\o{1,1}" -macro.i12 = "\\o{1,2}" -macro.i13 = "\\o{1,3}" -macro.i14 = "\\o{1,4}" -macro.i15 = "\\o{1,5}" -macro.i16 = "\\o{1,6}" -macro.i17 = "\\o{1,7}" -macro.i18 = "\\o{1,8}" -macro.i19 = "\\o{1,9}" -macro.i21 = "\\o{2,1}" -macro.i31 = "\\o{3,1}" -macro.i41 = "\\o{4,1}" -macro.i51 = "\\o{5,1}" -macro.i61 = "\\o{6,1}" -macro.i71 = "\\o{7,1}" -macro.i81 = "\\o{8,1}" -macro.i91 = "\\o{9,1}" -macro.img = "\\image" -macro.endquote = "\\endquotation" -macro.relatesto = "\\relates" - -spurious = "Missing comma in .*" \ - "Missing pattern .*" diff --git a/doc/config/qt-html-default-styles.qdocconf b/doc/config/qt-html-default-styles.qdocconf deleted file mode 100644 index 63ab33121af..00000000000 --- a/doc/config/qt-html-default-styles.qdocconf +++ /dev/null @@ -1,63 +0,0 @@ -# Define the location of the templates to use. Style sheets and scripts are -# specified relative to the template directory and will be copied into -# subdirectories of the output directory. - -HTML.templatedir = $SRCDIR/config - -HTML.stylesheets = ../templates/style/offline.css - -HTML.scripts = - -# Files not referenced in any qdoc file (last four needed by qtdemo) -# See also qhp.Qt.extraFiles -# for Qt 4: -extraimages.HTML = ../templates/images/qt-logo.png \ - ../templates/images/arrow_down.png \ - ../templates/images/breadcrumb.png \ - ../templates/images/bullet_gt.png \ - ../templates/images/bullet_dn.png \ - ../templates/images/bullet_sq.png \ - ../templates/images/bullet_up.png \ - ../templates/images/horBar.png \ - ../templates/images/sprites-combined.png \ - ../templates/images/qtcreator-screenshots.png \ - ../templates/images/bgrContent.png \ - ../templates/images/blu_dot.png \ - ../templates/images/btn_next.png \ - ../templates/images/btn_prev.png \ - ../templates/images/ico_note.png \ - ../templates/images/ico_note_attention.png \ - ../templates/images/ico_out.png \ - ../templates/images/arrow_bc.png \ - ../templates/images/home.png -# for Qt 5 -HTML.extraimages = ../templates/images/qt-logo.png \ - ../templates/images/arrow_down.png \ - ../templates/images/breadcrumb.png \ - ../templates/images/bullet_gt.png \ - ../templates/images/bullet_dn.png \ - ../templates/images/bullet_sq.png \ - ../templates/images/bullet_up.png \ - ../templates/images/horBar.png \ - ../templates/images/sprites-combined.png \ - ../templates/images/qtcreator-screenshots.png \ - ../templates/images/bgrContent.png \ - ../templates/images/blu_dot.png \ - ../templates/images/btn_next.png \ - ../templates/images/btn_prev.png \ - ../templates/images/ico_note.png \ - ../templates/images/ico_note_attention.png \ - ../templates/images/ico_out.png \ - ../templates/images/arrow_bc.png \ - ../templates/images/home.png - -# Include the style sheets and scripts used. - -HTML.headerstyles = \ - " \n" - -HTML.headerscripts = - -HTML.endheader = \ - "\n" \ - "\n" diff --git a/doc/config/qt-html-online-styles.qdocconf b/doc/config/qt-html-online-styles.qdocconf deleted file mode 100644 index 56b05dd30ad..00000000000 --- a/doc/config/qt-html-online-styles.qdocconf +++ /dev/null @@ -1,104 +0,0 @@ -# Define the location of the templates to use. Style sheets and scripts are -# specified relative to the template directory and will be copied into -# subdirectories of the output directory. - -HTML.templatedir = $SRCDIR/config - -HTML.stylesheets = ../templates/style/narrow.css \ - ../templates/style/style.css \ - ../templates/style/style_ie6.css \ - ../templates/style/style_ie7.css \ - ../templates/style/style_ie8.css \ - ../templates/style/superfish.css - -# Adding jquery and functions - providing online tools and search features -HTML.scripts = ../templates/scripts/functions.js \ - ../templates/scripts/narrow.js \ - ../templates/scripts/superfish.js \ - ../templates/scripts/jquery.js - - -# Files not referenced in any qdoc file. -# See also qhp.Qt.extraFiles -# for Qt 4 -extraimages.HTML = ../templates/images/qt-logo.png \ - ../templates/images/bg_l.png \ - ../templates/images/bg_l_blank.png \ - ../templates/images/bg_ll_blank.png \ - ../templates/images/bg_ul_blank.png \ - ../templates/images/btn_next_green.png \ - ../templates/images/btn_prev_green.png \ - ../templates/images/header_bg.png \ - ../templates/images/bg_r.png \ - ../templates/images/box_bg.png \ - ../templates/images/breadcrumb.png \ - ../templates/images/btn_next_green.png \ - ../templates/images/btn_prev_green.png \ - ../templates/images/bullet_gt.png \ - ../templates/images/bullet_dn.png \ - ../templates/images/bullet_sq.png \ - ../templates/images/bullet_up.png \ - ../templates/images/arrow_down.png \ - ../templates/images/feedbackground.png \ - ../templates/images/horBar.png \ - ../templates/images/page.png \ - ../templates/images/page_bg.png \ - ../templates/images/sprites-combined.png \ - ../templates/images/spinner.gif \ - ../templates/images/qtcreator-screenshots.png -# for Qt 5 -HTML.extraimages = ../templates/images/qt-logo.png \ - ../templates/images/bg_l.png \ - ../templates/images/bg_l_blank.png \ - ../templates/images/bg_ll_blank.png \ - ../templates/images/bg_ul_blank.png \ - ../templates/images/btn_next_green.png \ - ../templates/images/btn_prev_green.png \ - ../templates/images/header_bg.png \ - ../templates/images/bg_r.png \ - ../templates/images/box_bg.png \ - ../templates/images/breadcrumb.png \ - ../templates/images/btn_next_green.png \ - ../templates/images/btn_prev_green.png \ - ../templates/images/bullet_gt.png \ - ../templates/images/bullet_dn.png \ - ../templates/images/bullet_sq.png \ - ../templates/images/bullet_up.png \ - ../templates/images/arrow_down.png \ - ../templates/images/feedbackground.png \ - ../templates/images/horBar.png \ - ../templates/images/page.png \ - ../templates/images/page_bg.png \ - ../templates/images/sprites-combined.png \ - ../templates/images/spinner.gif \ - ../templates/images/qtcreator-screenshots.png - -# Include the style sheets and scripts used. - -HTML.headerstyles = \ - " \n" \ - " \n" \ - " \n" \ - " \n" \ - " \n" \ - " \n" \ - "\n" \ - "\n" \ - "\n\n" - -HTML.headerscripts = \ - "\n" \ - "\n\n" - -HTML.endheader = \ - "\n" \ - "\n" diff --git a/doc/config/qt-html-templates-online.qdocconf b/doc/config/qt-html-templates-online.qdocconf deleted file mode 100644 index c5dc66dff12..00000000000 --- a/doc/config/qt-html-templates-online.qdocconf +++ /dev/null @@ -1,161 +0,0 @@ -include(qt-html-online-styles.qdocconf) - -HTML.postheader = \ - "
\n" \ - "
\n" \ - "
\n" \ - " Home
\n" \ - " Qt Creator Manual\n" \ - "
\n" \ - "
\n" \ - " \n" \ - "
\n" \ - "
\n" \ - " \n" \ - "
\n" \ - "
\n" \ - "
\n" \ - "
\n" \ - "
\n" \ - " \n" \ - "
\n" \ - "
\n" \ - "
\n" \ - "
\n" \ - "

\n" \ - " API Lookup

\n" \ - "
\n" \ - " \n" \ - "
\n" \ - "
\n" \ - "
\n" \ - "

\n" \ - " Qt Topics

\n" \ - "
\n" \ - " \n" \ - "
\n" \ - "
\n" \ - "
\n" \ - "

\n" \ - " Examples

\n" \ - "
\n" \ - " \n" \ - "
\n" \ - "
\n" \ - "
\n" \ - "
\n" \ - "
\n" \ - "
\n" \ - "
    \n" \ - "
  • Home
    • \n" \ - " \n" - -HTML.postpostheader = \ - "
\n" \ - "
\n" \ - "
\n" \ - " \n" \ - "
\n" \ - "
\n" \ - "
\n" - -HTML.footer = \ - "
\n" \ - "
\n" \ - "
\n" \ - "
\n" \ - " \n" \ - "
\n" \ - "
\n" \ - "
\n" \ - "

\n" \ - "

\n" \ - " © 2014 Digia Plc and/or its\n" \ - " subsidiaries. Documentation contributions included herein are the copyrights of\n" \ - " their respective owners.

\n" \ - "
\n" \ - "

\n" \ - " The documentation provided herein is licensed under the terms of the\n" \ - " GNU Free Documentation\n" \ - " License version 1.3 as published by the Free Software Foundation.

\n" \ - "

\n" \ - " Documentation sources may be obtained from \n" \ - " www.qt-project.org.

\n" \ - "
\n" \ - "

\n" \ - " Digia, Qt and their respective logos are trademarks of Digia Plc \n" \ - " in Finland and/or other countries worldwide. All other trademarks are property\n" \ - " of their respective owners. Privacy Policy

\n" \ - "
\n" \ - "\n" - - -# Files not referenced in any qdoc file. -# See also extraimages.HTML -qhp.QtCreator.extraFiles = index.html \ - images/bg_l.png \ - images/bg_l_blank.png \ - images/bg_ll_blank.png \ - images/bg_ul_blank.png \ - images/header_bg.png \ - images/bg_r.png \ - images/box_bg.png \ - images/breadcrumb.png \ - images/bullet_gt.png \ - images/bullet_dn.png \ - images/bullet_sq.png \ - images/bullet_up.png \ - images/arrow_down.png \ - images/feedbackground.png \ - images/horBar.png \ - images/page.png \ - images/page_bg.png \ - images/sprites-combined.png \ - images/spinner.gif \ - images/qtcreator-screenshots.png \ - scripts/functions.js \ - scripts/jquery.js \ - scripts/narrow.js \ - scripts/superfish.js \ - style/narrow.css \ - style/superfish.css \ - style/style_ie6.css \ - style/style_ie7.css \ - style/style_ie8.css \ - style/style.css diff --git a/doc/config/qt-html-templates.qdocconf b/doc/config/qt-html-templates.qdocconf deleted file mode 100644 index 95507fefc52..00000000000 --- a/doc/config/qt-html-templates.qdocconf +++ /dev/null @@ -1,67 +0,0 @@ -include(qt-html-default-styles.qdocconf) - -HTML.postheader = \ - "
\n" \ - "
\n" \ - " Qt Creator Documentation $QTC_VERSION\n" \ - "
\n" \ - "
\n" \ - " \n" \ - "
\n" \ - "
\n" \ - "
\n" - -HTML.footer = \ - "
\n" \ - " \n" \ - "
\n" \ - "
\n" \ - "
\n" \ - "

\n" \ - " © 2014 Digia Plc and/or its\n" \ - " subsidiaries. Documentation contributions included herein are the copyrights of\n" \ - " their respective owners.

\n" \ - "
\n" \ - "

\n" \ - " The documentation provided herein is licensed under the terms of the\n" \ - " GNU Free Documentation\n" \ - " License version 1.3 as published by the Free Software Foundation.

\n" \ - "

\n" \ - " Documentation sources may be obtained from \n" \ - " www.qt-project.org.

\n" \ - "
\n" \ - "

\n" \ - " Digia, Qt and their respective logos are trademarks of Digia Plc \n" \ - " in Finland and/or other countries worldwide. All other trademarks are property\n" \ - " of their respective owners. Privacy Policy

\n" \ - "
\n" \ - -# Files not referenced in any qdoc file. -# See also extraimages.HTML -qhp.QtCreator.extraFiles = index.html \ - images/arrow_down.png \ - images/breadcrumb.png \ - images/bullet_gt.png \ - images/bullet_dn.png \ - images/bullet_sq.png \ - images/bullet_up.png \ - images/horBar.png \ - images/sprites-combined.png \ - images/qtcreator-screenshots.png \ - images/bgrContent.png \ - images/blu_dot.png \ - images/btn_next.png \ - images/btn_prev.png \ - images/ico_note.png \ - images/ico_note_attention.png \ - images/ico_out.png \ - images/home.png \ - images/arrow_bc.png \ - style/offline.css diff --git a/doc/config/qtcreator-developer.qdocconf b/doc/config/qtcreator-developer.qdocconf index ef04d0b29f8..14e7d28c044 100644 --- a/doc/config/qtcreator-developer.qdocconf +++ b/doc/config/qtcreator-developer.qdocconf @@ -43,7 +43,24 @@ sources.fileextensions = "*.cpp *.qdoc" imagedirs = $SRCDIR/api/images $SRCDIR/images $SRCDIR/templates/images outputdir = $OUTDIR exampledirs = $SRCDIR/api/examples -indexes = qt.index + +indexes += $QDOC_INDEX_DIR/qtwidgets/qtwidgets.index \ + $QDOC_INDEX_DIR/qtcore/qtcore.index \ + $QDOC_INDEX_DIR/qtqml/qtqml.index \ + $QDOC_INDEX_DIR/qtquick/qtquick.index \ + $QDOC_INDEX_DIR/qmake/qmake.index \ + $QDOC_INDEX_DIR/qtdesigner/qtdesigner.index \ + $QDOC_INDEX_DIR/qtdoc/qtdoc.index \ + $QDOC_INDEX_DIR/qtgui/qtgui.index \ + $QDOC_INDEX_DIR/qthelp/qthelp.index \ + $QDOC_INDEX_DIR/qtquickcontrols/qtquickcontrols.index \ + $QDOC_INDEX_DIR/qtquicklayouts/qtquicklayouts.index \ + $QDOC_INDEX_DIR/qtlinguist/qtlinguist.index \ + $QDOC_INDEX_DIR/qtscript/qtscript.index \ + $QDOC_INDEX_DIR/qtsensors/qtsensors.index \ + $QDOC_INDEX_DIR/qtuitools/qtuitools.index \ + $QDOC_INDEX_DIR/qtwebkit/qtwebkit.index \ + $QDOC_INDEX_DIR/qtxml/qtxml.index include(macros.qdocconf) include(qt-cpp-ignore.qdocconf) diff --git a/doc/doc.pri b/doc/doc.pri index fa52a5c6023..550f60a3a95 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -24,19 +24,15 @@ QHP_FILE = $$OUT_PWD/doc/html/qtcreator.qhp QCH_FILE = $$IDE_DOC_PATH/qtcreator.qch HELP_DEP_FILES = $$PWD/src/qtcreator.qdoc \ - $$PWD/config/compat.qdocconf \ $$PWD/config/macros.qdocconf \ $$PWD/config/qt-cpp-ignore.qdocconf \ - $$PWD/config/qt-defines.qdocconf \ - $$PWD/config/qt-html-templates.qdocconf \ - $$PWD/config/qt-html-default-styles.qdocconf \ - $$PWD/qtcreator$${COMPAT}.qdocconf + $$PWD/config/qt-defines.qdocconf -html_docs.commands = $$qdoc($$OUT_PWD/doc/html) $$PWD/qtcreator$${COMPAT}.qdocconf +html_docs.commands = $$qdoc($$OUT_PWD/doc/html) $$PWD/qtcreator.qdocconf html_docs.depends += $$HELP_DEP_FILES html_docs.files = $$QHP_FILE -html_docs_online.commands = $$qdoc($$OUT_PWD/doc/html) $$PWD/qtcreator-online$${COMPAT}.qdocconf +html_docs_online.commands = $$qdoc($$OUT_PWD/doc/html) $$PWD/qtcreator-online.qdocconf html_docs_online.depends += $$HELP_DEP_FILES qch_docs.commands = $$HELPGENERATOR -o \"$$QCH_FILE\" $$QHP_FILE @@ -57,12 +53,14 @@ DEV_HELP_DEP_FILES = \ $$PWD/api/plugin-metadata.qdoc \ $$PWD/api/plugin-lifecycle.qdoc \ $$PWD/api/pluginmanager.qdoc \ - $$PWD/api/qtcreator-dev$${COMPAT}.qdocconf + $$PWD/api/qtcreator-documentation.qdoc \ + $$PWD/api/qtcreator-ui-text.qdoc \ + $$PWD/api/qtcreator-dev.qdocconf -dev_html_docs.commands = $$qdoc($$OUT_PWD/doc/html-dev) $$PWD/api/qtcreator-dev$${COMPAT}.qdocconf +dev_html_docs.commands = $$qdoc($$OUT_PWD/doc/html-dev) $$PWD/api/qtcreator-dev.qdocconf dev_html_docs.depends += $$DEV_HELP_DEP_FILES -dev_html_docs_online.commands = $$qdoc($$OUT_PWD/doc/html-dev) $$PWD/api/qtcreator-dev-online$${COMPAT}.qdocconf +dev_html_docs_online.commands = $$qdoc($$OUT_PWD/doc/html-dev) $$PWD/api/qtcreator-dev-online.qdocconf dev_html_docs_online.depends += $$DEV_HELP_DEP_FILES dev_qch_docs.commands = $$HELPGENERATOR -o \"$$DEV_QCH_FILE\" $$DEV_QHP_FILE diff --git a/doc/examples/accelbubble/main.qml b/doc/examples/accelbubble/main.qml index 0f3d1989413..253695732d3 100644 --- a/doc/examples/accelbubble/main.qml +++ b/doc/examples/accelbubble/main.qml @@ -109,6 +109,10 @@ ApplicationWindow { menuBar: MenuBar { Menu { title: qsTr("File") + MenuItem { + text: qsTr("&Open") + onTriggered: console.log("Open action triggered"); + } MenuItem { text: qsTr("Exit") onTriggered: Qt.quit(); diff --git a/doc/images/qmldesigner-new-project.png b/doc/images/qmldesigner-new-project.png index 1c9df5a57b1..428d6e1b63a 100644 Binary files a/doc/images/qmldesigner-new-project.png and b/doc/images/qmldesigner-new-project.png differ diff --git a/doc/images/qtcreator-add-resource-wizard.png b/doc/images/qtcreator-add-resource-wizard.png index fc66daadb97..e9f8d7bfd1f 100644 Binary files a/doc/images/qtcreator-add-resource-wizard.png and b/doc/images/qtcreator-add-resource-wizard.png differ diff --git a/doc/images/qtcreator-android-certificate.png b/doc/images/qtcreator-android-certificate.png new file mode 100644 index 00000000000..2b4d2355494 Binary files /dev/null and b/doc/images/qtcreator-android-certificate.png differ diff --git a/doc/images/qtcreator-new-opengl-file.png b/doc/images/qtcreator-new-opengl-file.png index 789e762e776..3e64d1fff58 100644 Binary files a/doc/images/qtcreator-new-opengl-file.png and b/doc/images/qtcreator-new-opengl-file.png differ diff --git a/doc/images/qtcreator-new-qt-gui-application.png b/doc/images/qtcreator-new-qt-gui-application.png index 60f398a016b..1ca8d227f6d 100644 Binary files a/doc/images/qtcreator-new-qt-gui-application.png and b/doc/images/qtcreator-new-qt-gui-application.png differ diff --git a/doc/images/qtcreator-new-qt-quick-project-wizard.png b/doc/images/qtcreator-new-qt-quick-project-wizard.png index 88c59c37fd6..1b19a9c72a0 100644 Binary files a/doc/images/qtcreator-new-qt-quick-project-wizard.png and b/doc/images/qtcreator-new-qt-quick-project-wizard.png differ diff --git a/doc/qtcreator-online-qt4.qdocconf b/doc/qtcreator-online-qt4.qdocconf deleted file mode 100644 index 03c92f7e02f..00000000000 --- a/doc/qtcreator-online-qt4.qdocconf +++ /dev/null @@ -1,4 +0,0 @@ -# Run qdoc from the directory that contains this file. -include(config/compat.qdocconf) -include(config/qtcreator-project.qdocconf) -include(config/qt-html-templates-online.qdocconf) diff --git a/doc/qtcreator-qt4.qdocconf b/doc/qtcreator-qt4.qdocconf deleted file mode 100644 index 8354f88ecce..00000000000 --- a/doc/qtcreator-qt4.qdocconf +++ /dev/null @@ -1,4 +0,0 @@ -# Run qdoc from the directory that contains this file. -include(config/compat.qdocconf) -include(config/qtcreator-project.qdocconf) -include(config/qt-html-templates.qdocconf) diff --git a/doc/src/android/androiddev.qdoc b/doc/src/android/androiddev.qdoc index e8bd2a3cfff..0dfacb9b59f 100644 --- a/doc/src/android/androiddev.qdoc +++ b/doc/src/android/androiddev.qdoc @@ -154,7 +154,7 @@ \endlist - \li Select \gui File > \gui {New File or Project} > \gui Applications > + \li Select \gui File > \gui {New File or Project} > \gui Application > \gui {Qt Quick Application} > \gui Choose, and follow the instructions of the wizard. For more information, see \l{Creating Qt Quick Projects}. diff --git a/doc/src/android/deploying-android.qdoc b/doc/src/android/deploying-android.qdoc index 9edf35f52cc..b9602e0ced3 100644 --- a/doc/src/android/deploying-android.qdoc +++ b/doc/src/android/deploying-android.qdoc @@ -25,9 +25,9 @@ \title Deploying Applications to Android Devices - On Android, applications are distributed in specially structured type of ZIP - packages called APK. \QC supports the following methods of deployment for - Android applications: + On Android, applications are distributed in a specially structured type of + ZIP package called an APK. \QC supports the following methods of deployment + for Android applications: \list @@ -165,8 +165,78 @@ \section3 Signing Android Packages - In the \gui {Sign Package} group you can sign the Android package by using - a private key from the keystore. To create new keys, select \gui Create. + To publish your application, you must sign it by using a \e {public-private + key pair} that consists of a \e certificate and a corresponding + \e {private key} and is identified by an \e alias. The key pair is used to + verify that the future versions of your application are actually created by + you. + + \warning Keep the key pair in a safe place and take back up copies, because + you cannot update the application if you lose the key pair. + + You can use \QC to generate a keystore and a \e {self-signed} certificate. + The generated certificate has the structure of an X.509 v3 digital + certificate. It contains information about the version, serial number, and + validity period of the certificate, the ID of the algorithm that is used to + encrypt the data, the organization that issued the certificate, and the + \e subject (owner) of the certificate. In case of a self-signed certificate, + the issuer and owner of the certificate are the same. In addition, the + certificate contains information about the algorithm that is used to sign + the certificate, as well as the signature of the certificate. + + The keystore is protected by a password. In addition, you can protect each + alias with its individual password. + + When you sign an Android application, you must select a keystore that + contains certificates and a certificate alias from the keystore. The public + key (certificate) for the alias is embedded into the APK during signing. + + To create a keystore and a self-signed certificate: + + \list 1 + + \li In the \gui Keystore field, select \gui Create to create a new + keystore that contains one key pair in the \gui {Create Keystore and + a Certificate} dialog: + + \image qtcreator-android-certificate.png + + \li In the \gui Keystore group, enter a password to protect the + keystore. + + \li In the \gui Certificate group, specify the key size and validity + period of the certificate. You can specify a separate password to + protect the key pair or use the keystore password. + + \li In the \gui {Certificate Distinguished Names} group, enter + information about yourself and your company or organization that + identifies the issuer and the owner of the key pair. + + \li Select \gui Save. + + \li In the \gui {Keystore File Name} dialog, enter a name for the + keystore and select a location for it. + + \li In the \gui Keystore dialog, enter the keystore password to create + the key pair in the keystore. + + \endlist + + To sign an Android package by using a key pair, specify settings in the + \gui {Sign package} group: + + \list 1 + + \li In the \gui Keystore field, select \gui Choose to select an existing + keystore. + + \li In the \gui {Certificate alias} field, select an alias from the list + of key pairs that the keystore contains. + + \li Select the \gui {Sign package} check box to use the alias to + sign the Android package. + + \endlist \section3 Adding External Libraries diff --git a/doc/src/editors/creator-editors.qdoc b/doc/src/editors/creator-editors.qdoc index 6f89e849e54..cb9ee53b515 100644 --- a/doc/src/editors/creator-editors.qdoc +++ b/doc/src/editors/creator-editors.qdoc @@ -1005,7 +1005,7 @@ the URL in the \gui {General Messages} output pane. To paste any content that you copied to the clipboard, select \gui Tools > - \gui {Code Pasting} > \gui {Paste Clipboard}. + \gui {Code Pasting} > \gui {Paste Snippet}. To fetch a snippet of code from the server, select \gui{Tools} > \gui{Code Pasting} > \gui{Fetch Snippet} or press \key{Alt+C,Alt+F}. Select diff --git a/doc/src/howto/creator-cli.qdoc b/doc/src/howto/creator-cli.qdoc index 69d596feeec..4d8e531abc3 100644 --- a/doc/src/howto/creator-cli.qdoc +++ b/doc/src/howto/creator-cli.qdoc @@ -136,6 +136,11 @@ \li Core plugin: display keyboard shortcuts as popups when you press them. Mostly useful when presenting \QC to someone else. + \row + \li -theme + \li Core plugin: apply a dark color theme to \QC, without using + stylesheets. + \row \li -debug \li Debugger plugin: attach to the process with the given process ID. @@ -201,4 +206,7 @@ the \l{Specifying Text Editor Settings}{text editor color scheme} and the styling of the integrated \QD. + You can also switch to a dark theme to customize the appearance of widgets, + colors, and icons without using stylesheets. + */ diff --git a/doc/src/overview/creator-configuring.qdoc b/doc/src/overview/creator-configuring.qdoc index e3d882581bc..17dfe029646 100644 --- a/doc/src/overview/creator-configuring.qdoc +++ b/doc/src/overview/creator-configuring.qdoc @@ -98,7 +98,15 @@ \section1 Changing Color Schemes - You can use \QC with your favorite color scheme that defines how code + Themes enable you to customize the appearance of the \QC UI: widgets, + colors, and icons. + + To switch from the default theme to a dark theme, select \gui Tools > + \gui Options > \gui Environment, and then select \gui Dark in the \gui Theme + field. + + You can use the \QC text and code editors with your favorite color scheme + that defines how code elements are highlighted and which background color is used. You can select one of the predefined color schemes or create custom ones. The color schemes apply to highlighting C++ files, QML files, and generic diff --git a/doc/src/overview/creator-tech-support.qdoc b/doc/src/overview/creator-tech-support.qdoc index d56088d25ee..b368b9e9200 100644 --- a/doc/src/overview/creator-tech-support.qdoc +++ b/doc/src/overview/creator-tech-support.qdoc @@ -57,8 +57,8 @@ \li \l{http://qt-apps.org/}{Qt Apps} \row - \li Develop with a commercial Qt license and support - Qt by Digia - \li \l{http://qt.digia.com/Product/Licensing/}{Qt Licensing} + \li Develop with a commercial Qt license and support - Qt by The Qt Company + \li \l{http://qt.io/licensing/}{Qt Licensing} \endtable */ diff --git a/doc/src/qnx/creator-deployment-bb10.qdoc b/doc/src/qnx/creator-deployment-bb10.qdoc index 13400aa4d06..ed433c45d28 100644 --- a/doc/src/qnx/creator-deployment-bb10.qdoc +++ b/doc/src/qnx/creator-deployment-bb10.qdoc @@ -35,7 +35,9 @@ To deploy Qt applications to BlackBerry 10 devices: \list 1 - \li Select \gui File > \gui {New File or Project} > \gui {Applications} to create a \gui {Qt Quick Application}, \gui {Qt Widgets Application}, or \gui {BlackBerry Cascades Application}. + \li Select \gui File > \gui {New File or Project} > \gui {Application} + to create a \gui {Qt Quick Application}, \gui {Qt Widgets + Application}, or \gui {BlackBerry Cascades Application}. \li Select a BlackBerry 10 \l{glossary-buildandrun-kit}{kit} for either device or simulator. For more information about adding kits, see \l{Connecting BlackBerry 10 Devices}. \li When \QC prompts you to generate a BAR descriptor file, answer \gui Yes to generate the file and enable the packaging process. \li You can use the BAR descriptor editor to customize the appearance and behavior of the application. diff --git a/doc/src/qtquick/creator-mobile-app-tutorial.qdoc b/doc/src/qtquick/creator-mobile-app-tutorial.qdoc index 31d225dfd3d..592597e483e 100644 --- a/doc/src/qtquick/creator-mobile-app-tutorial.qdoc +++ b/doc/src/qtquick/creator-mobile-app-tutorial.qdoc @@ -61,7 +61,7 @@ \list 1 - \li Select \gui File > \gui {New File or Project} > \gui Applications > + \li Select \gui File > \gui {New File or Project} > \gui Application > \gui {Qt Quick Application} > \gui Choose. \li In the \gui{Name} field, type \b{accelbubble}. @@ -120,7 +120,7 @@ \li Click \gui Design to open the file in \QMLD. - \li In the \gui Navigator pane, select \gui Text and press \key Delete + \li In the \gui Navigator pane, select \gui Label and press \key Delete to delete it. \li In the \gui Library view, \gui Resources tab, select Bluebubble.svg @@ -284,6 +284,8 @@ When you have completed the steps, the main.qml file should look as follows: - \quotefile accelbubble/main.qml + \quotefromfile accelbubble/main.qml + \skipto import + \printuntil /^\}/ */ diff --git a/doc/src/qtquick/qtquick-app-tutorial.qdoc b/doc/src/qtquick/qtquick-app-tutorial.qdoc index ee97e77be08..d824ab129e1 100644 --- a/doc/src/qtquick/qtquick-app-tutorial.qdoc +++ b/doc/src/qtquick/qtquick-app-tutorial.qdoc @@ -47,7 +47,7 @@ \list 1 - \li Select \gui{File > New File or Project > Applications > + \li Select \gui{File > New File or Project > Application > Qt Quick Application > Choose}. \li In the \gui{Name} field, type \b {Transitions}. diff --git a/doc/src/qtquick/qtquick-creating.qdoc b/doc/src/qtquick/qtquick-creating.qdoc index cb4b02589b4..a48d403da66 100644 --- a/doc/src/qtquick/qtquick-creating.qdoc +++ b/doc/src/qtquick/qtquick-creating.qdoc @@ -64,7 +64,7 @@ \list 1 - \li Select \gui File > \gui {New File or Project} > \gui Applications > + \li Select \gui File > \gui {New File or Project} > \gui Application > \gui {Qt Quick UI} > \gui Choose. \li In the \gui {Qt Quick component set} field, select the component set @@ -118,7 +118,7 @@ \list 1 - \li Select \gui File > \gui {New File or Project} > \gui Applications > + \li Select \gui File > \gui {New File or Project} > \gui Application > \gui {Qt Quick Application} > \gui Choose. \li In the \gui {Qt Quick component set} field, select the component set diff --git a/doc/src/widgets/qtdesigner-app-tutorial.qdoc b/doc/src/widgets/qtdesigner-app-tutorial.qdoc index ee94572578a..32837254e44 100644 --- a/doc/src/widgets/qtdesigner-app-tutorial.qdoc +++ b/doc/src/widgets/qtdesigner-app-tutorial.qdoc @@ -41,7 +41,7 @@ \list 1 - \li Select \gui{File > New File or Project > Applications > Qt Widgets + \li Select \gui{File > New File or Project > Application > Qt Widgets Application > Choose}. \image qtcreator-new-qt-gui-application.png "New File or Project dialog" diff --git a/doc/templates/images/api_examples.png b/doc/templates/images/api_examples.png deleted file mode 100644 index 1fcbc96bd16..00000000000 Binary files a/doc/templates/images/api_examples.png and /dev/null differ diff --git a/doc/templates/images/api_lookup.png b/doc/templates/images/api_lookup.png deleted file mode 100644 index 1cffd5e3527..00000000000 Binary files a/doc/templates/images/api_lookup.png and /dev/null differ diff --git a/doc/templates/images/api_topics.png b/doc/templates/images/api_topics.png deleted file mode 100644 index a76a6c3ed22..00000000000 Binary files a/doc/templates/images/api_topics.png and /dev/null differ diff --git a/doc/templates/images/arrow_bc.png b/doc/templates/images/arrow_bc.png deleted file mode 100644 index f2a83a57406..00000000000 Binary files a/doc/templates/images/arrow_bc.png and /dev/null differ diff --git a/doc/templates/images/arrow_down.png b/doc/templates/images/arrow_down.png deleted file mode 100644 index 9d01e97f6a9..00000000000 Binary files a/doc/templates/images/arrow_down.png and /dev/null differ diff --git a/doc/templates/images/bg_l.png b/doc/templates/images/bg_l.png deleted file mode 100644 index 90b1da10b9b..00000000000 Binary files a/doc/templates/images/bg_l.png and /dev/null differ diff --git a/doc/templates/images/bg_l_blank.png b/doc/templates/images/bg_l_blank.png deleted file mode 100644 index 5a9673d81bd..00000000000 Binary files a/doc/templates/images/bg_l_blank.png and /dev/null differ diff --git a/doc/templates/images/bg_ll.png b/doc/templates/images/bg_ll.png deleted file mode 100644 index 99796e7b5f0..00000000000 Binary files a/doc/templates/images/bg_ll.png and /dev/null differ diff --git a/doc/templates/images/bg_ll_blank.png b/doc/templates/images/bg_ll_blank.png deleted file mode 100644 index 95a1c45e04b..00000000000 Binary files a/doc/templates/images/bg_ll_blank.png and /dev/null differ diff --git a/doc/templates/images/bg_lr.png b/doc/templates/images/bg_lr.png deleted file mode 100644 index fef1d17bbed..00000000000 Binary files a/doc/templates/images/bg_lr.png and /dev/null differ diff --git a/doc/templates/images/bg_r.png b/doc/templates/images/bg_r.png deleted file mode 100644 index f0fb121dea5..00000000000 Binary files a/doc/templates/images/bg_r.png and /dev/null differ diff --git a/doc/templates/images/bg_ul.png b/doc/templates/images/bg_ul.png deleted file mode 100644 index 303181f18f3..00000000000 Binary files a/doc/templates/images/bg_ul.png and /dev/null differ diff --git a/doc/templates/images/bg_ul_blank.png b/doc/templates/images/bg_ul_blank.png deleted file mode 100644 index 70512614cc7..00000000000 Binary files a/doc/templates/images/bg_ul_blank.png and /dev/null differ diff --git a/doc/templates/images/bg_ur.png b/doc/templates/images/bg_ur.png deleted file mode 100644 index bfa51a4cee6..00000000000 Binary files a/doc/templates/images/bg_ur.png and /dev/null differ diff --git a/doc/templates/images/bg_ur_blank.png b/doc/templates/images/bg_ur_blank.png deleted file mode 100644 index 57799616c0c..00000000000 Binary files a/doc/templates/images/bg_ur_blank.png and /dev/null differ diff --git a/doc/templates/images/bgrContent.png b/doc/templates/images/bgrContent.png deleted file mode 100644 index 1a81b030877..00000000000 Binary files a/doc/templates/images/bgrContent.png and /dev/null differ diff --git a/doc/templates/images/blu_dot.png b/doc/templates/images/blu_dot.png deleted file mode 100644 index c332148f745..00000000000 Binary files a/doc/templates/images/blu_dot.png and /dev/null differ diff --git a/doc/templates/images/box_bg.png b/doc/templates/images/box_bg.png deleted file mode 100644 index 3322f923f81..00000000000 Binary files a/doc/templates/images/box_bg.png and /dev/null differ diff --git a/doc/templates/images/breadcrumb.png b/doc/templates/images/breadcrumb.png deleted file mode 100644 index 0ded5514d23..00000000000 Binary files a/doc/templates/images/breadcrumb.png and /dev/null differ diff --git a/doc/templates/images/btn_next.png b/doc/templates/images/btn_next.png deleted file mode 100644 index f7bc2b7170a..00000000000 Binary files a/doc/templates/images/btn_next.png and /dev/null differ diff --git a/doc/templates/images/btn_next_green.png b/doc/templates/images/btn_next_green.png deleted file mode 100644 index c649f18572e..00000000000 Binary files a/doc/templates/images/btn_next_green.png and /dev/null differ diff --git a/doc/templates/images/btn_prev.png b/doc/templates/images/btn_prev.png deleted file mode 100644 index 10a620c5189..00000000000 Binary files a/doc/templates/images/btn_prev.png and /dev/null differ diff --git a/doc/templates/images/btn_prev_green.png b/doc/templates/images/btn_prev_green.png deleted file mode 100644 index d1d29895b27..00000000000 Binary files a/doc/templates/images/btn_prev_green.png and /dev/null differ diff --git a/doc/templates/images/bullet_dn.png b/doc/templates/images/bullet_dn.png deleted file mode 100644 index f7762472e23..00000000000 Binary files a/doc/templates/images/bullet_dn.png and /dev/null differ diff --git a/doc/templates/images/bullet_gt.png b/doc/templates/images/bullet_gt.png deleted file mode 100644 index 7561b4edc4c..00000000000 Binary files a/doc/templates/images/bullet_gt.png and /dev/null differ diff --git a/doc/templates/images/bullet_sq.png b/doc/templates/images/bullet_sq.png deleted file mode 100644 index a84845e3c7e..00000000000 Binary files a/doc/templates/images/bullet_sq.png and /dev/null differ diff --git a/doc/templates/images/bullet_up.png b/doc/templates/images/bullet_up.png deleted file mode 100644 index 7de2f06954b..00000000000 Binary files a/doc/templates/images/bullet_up.png and /dev/null differ diff --git a/doc/templates/images/content_bg.png b/doc/templates/images/content_bg.png deleted file mode 100644 index 416397d047e..00000000000 Binary files a/doc/templates/images/content_bg.png and /dev/null differ diff --git a/doc/templates/images/feedbackground.png b/doc/templates/images/feedbackground.png deleted file mode 100644 index 3a38d995d7f..00000000000 Binary files a/doc/templates/images/feedbackground.png and /dev/null differ diff --git a/doc/templates/images/form_bg.png b/doc/templates/images/form_bg.png deleted file mode 100644 index bf2ee544645..00000000000 Binary files a/doc/templates/images/form_bg.png and /dev/null differ diff --git a/doc/templates/images/header.png b/doc/templates/images/header.png deleted file mode 100644 index 3c68d9c5258..00000000000 Binary files a/doc/templates/images/header.png and /dev/null differ diff --git a/doc/templates/images/header_bg.png b/doc/templates/images/header_bg.png deleted file mode 100644 index a436aa61eff..00000000000 Binary files a/doc/templates/images/header_bg.png and /dev/null differ diff --git a/doc/templates/images/home.png b/doc/templates/images/home.png deleted file mode 100644 index 8de6d0c81f6..00000000000 Binary files a/doc/templates/images/home.png and /dev/null differ diff --git a/doc/templates/images/horBar.png b/doc/templates/images/horBar.png deleted file mode 100644 index 88b2237e46c..00000000000 Binary files a/doc/templates/images/horBar.png and /dev/null differ diff --git a/doc/templates/images/ico_note.png b/doc/templates/images/ico_note.png deleted file mode 100644 index 13794046cf2..00000000000 Binary files a/doc/templates/images/ico_note.png and /dev/null differ diff --git a/doc/templates/images/ico_note_attention.png b/doc/templates/images/ico_note_attention.png deleted file mode 100644 index b85b696b10e..00000000000 Binary files a/doc/templates/images/ico_note_attention.png and /dev/null differ diff --git a/doc/templates/images/ico_out.png b/doc/templates/images/ico_out.png deleted file mode 100644 index ff6e458fb15..00000000000 Binary files a/doc/templates/images/ico_out.png and /dev/null differ diff --git a/doc/templates/images/page.png b/doc/templates/images/page.png deleted file mode 100644 index 1db151bd31e..00000000000 Binary files a/doc/templates/images/page.png and /dev/null differ diff --git a/doc/templates/images/page_bg.png b/doc/templates/images/page_bg.png deleted file mode 100644 index 9b3bd999dfb..00000000000 Binary files a/doc/templates/images/page_bg.png and /dev/null differ diff --git a/doc/templates/images/print.png b/doc/templates/images/print.png deleted file mode 100644 index 4581da1870c..00000000000 Binary files a/doc/templates/images/print.png and /dev/null differ diff --git a/doc/templates/images/qt_guide.png b/doc/templates/images/qt_guide.png deleted file mode 100644 index 9f53a052eb4..00000000000 Binary files a/doc/templates/images/qt_guide.png and /dev/null differ diff --git a/doc/templates/images/qt_icon.png b/doc/templates/images/qt_icon.png deleted file mode 100644 index fbaee358435..00000000000 Binary files a/doc/templates/images/qt_icon.png and /dev/null differ diff --git a/doc/templates/images/qt_ref_doc.png b/doc/templates/images/qt_ref_doc.png deleted file mode 100644 index 141488b8609..00000000000 Binary files a/doc/templates/images/qt_ref_doc.png and /dev/null differ diff --git a/doc/templates/images/qt_tools.png b/doc/templates/images/qt_tools.png deleted file mode 100644 index cc24179819f..00000000000 Binary files a/doc/templates/images/qt_tools.png and /dev/null differ diff --git a/doc/templates/images/sep.png b/doc/templates/images/sep.png deleted file mode 100644 index c895646f232..00000000000 Binary files a/doc/templates/images/sep.png and /dev/null differ diff --git a/doc/templates/images/spinner.gif b/doc/templates/images/spinner.gif deleted file mode 100644 index 1ed786f2ece..00000000000 Binary files a/doc/templates/images/spinner.gif and /dev/null differ diff --git a/doc/templates/images/sprites-combined.png b/doc/templates/images/sprites-combined.png deleted file mode 100644 index 3a48b21f6b8..00000000000 Binary files a/doc/templates/images/sprites-combined.png and /dev/null differ diff --git a/doc/templates/scripts/functions.js b/doc/templates/scripts/functions.js deleted file mode 100644 index 1b1f8732931..00000000000 --- a/doc/templates/scripts/functions.js +++ /dev/null @@ -1,189 +0,0 @@ -/* START non link areas where cursor should change to pointing hand */ -$('.t_button').mouseover(function() { - $('.t_button').css('cursor','pointer'); - /*document.getElementById(this.id).style.cursor='pointer';*/ -}); -/* END non link areas */ -$('#smallA').click(function() { - $('.content .heading,.content h1, .content h2, .content h3, .content p, .content li, .content table').css('font-size','smaller'); - $('.t_button').removeClass('active') - $(this).addClass('active') -}); - -$('#medA').click(function() { - $('.content .heading').css('font','600 16px/1 Arial'); - $('.content h1').css('font','600 18px/1.2 Arial'); - $('.content h2').css('font','600 16px/1.2 Arial'); - $('.content h3').css('font','600 14px/1.2 Arial'); - $('.content p').css('font','13px/20px Verdana'); - $('.content li').css('font','400 13px/1 Verdana'); - $('.content li').css('line-height','14px'); - $('.content .toc li').css('font', 'normal 10px/1.2 Verdana'); - $('.content table').css('font','13px/1.2 Verdana'); - $('.content .heading').css('font','600 16px/1 Arial'); - $('.content .indexboxcont li').css('font','600 13px/1 Verdana'); - $('.t_button').removeClass('active') - $(this).addClass('active') -}); - -$('#bigA').click(function() { - $('.content .heading,.content h1, .content h2, .content h3, .content p, .content li, .content table').css('font-size','large'); - $('.content .heading,.content h1, .content h2, .content h3, .content p, .content li, .content table').css('line-height','25px'); - $('.t_button').removeClass('active') - $(this).addClass('active') -}); - -$('.feedclose').click(function() { - $('.bd').show(); - $('.hd').show(); - $('.footer').show(); - $('#feedbackBox').hide(); - $('#blurpage').hide(); -}); - -$('.feedback').click(function() { - $('.bd').hide(); - $('.hd').hide(); - $('.footer').hide(); - $('#feedbackBox').show(); - $('#blurpage').show(); -}); -var lookupCount = 0; -var articleCount = 0; -var exampleCount = 0; -var qturl = ""; // change from "http://doc.qt.nokia.com/4.6/" to 0 so we can have relative links - -function processData(response){ - var propertyTags = response.getElementsByTagName('page'); - - for (var i=0; i< propertyTags.length; i++) { - var linkStart = "
  • " + 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++; - - for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++){ - full_li_element = linkStart + propertyTags[i].getElementsByTagName('pageUrl')[j].firstChild.nodeValue; - 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++; - - - for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++){ - full_li_element = linkStart + propertyTags[i].getElementsByTagName('pageUrl')[j].firstChild.nodeValue; - full_li_element =full_li_element + "'>" + propertyTags[i].getElementsByTagName('pageTitle')[0].firstChild.nodeValue + linkEnd ; - - $('#ul003').append(full_li_element); - $('#ul003 .defaultLink').css('display','none'); - - } - } - if(i==propertyTags.length){$('#pageType').removeClass('loading');} - - } - if(lookupCount > 0){$('#ul001 .menuAlert').remove();$('#ul001').prepend('
  • Found ' + lookupCount + ' hits
    • ');$('#ul001 li').css('display','block');$('.sidebar .search form input').removeClass('loading');} - if(articleCount > 0){$('#ul002 .menuAlert').remove();$('#ul002').prepend('
  • Found ' + articleCount + ' hits
    • ');$('#ul002 li').css('display','block');} - if(exampleCount > 0){$('#ul003 .menuAlert').remove();$('#ul003').prepend('
  • Found ' + articleCount + ' hits
    • ');$('#ul003 li').css('display','block');} - - if(lookupCount == 0){$('#ul001 .menuAlert').remove();$('#ul001').prepend('
  • Found no result
    • ');$('#ul001 li').css('display','block');$('.sidebar .search form input').removeClass('loading');} - if(articleCount == 0){$('#ul002 .menuAlert').remove();$('#ul002').prepend('
  • Found no result
    • ');$('#ul002 li').css('display','block');} - if(exampleCount == 0){$('#ul003 .menuAlert').remove();$('#ul003').prepend('
  • Found no result
    • ');$('#ul003 li').css('display','block');} - // reset count variables; - lookupCount=0; - articleCount = 0; - exampleCount = 0; - -} -//build regular expression object to find empty string or any number of blank -var blankRE=/^\s*$/; -function CheckEmptyAndLoadList() -{ - $('#feedUrl').remove(); - $('.menuAlert').remove(); - $('.liveResult').remove(); - $('.defaultLink').css('display','block'); - var value = document.getElementById('pageType').value; - if((blankRE.test(value)) || (value.length < 3)) - { - //empty inputbox - // load default li elements into the ul if empty - // loadAllList(); // replaced - $('.defaultLink').css('display','block'); - // $('.liveResult').css('display','none'); - }else{ - $('.defaultLink').css('display','none'); - } -} -/* -$(window).resize(function(){ -if($(window).width()<400) - $('body').addClass('offline'); -else - $('body').removeClass('offline'); - }); - */ -// Loads on doc ready - $(document).ready(function () { - //alert(pageUrl); - //$('#pageUrl').attr('foo',pageUrl); - var pageTitle = $('title').html(); - var currentString = $('#pageType').val() ; - if(currentString.length < 1){ - $('.defaultLink').css('display','block'); - CheckEmptyAndLoadList(); - } - - $('#pageType').keyup(function () { - var searchString = $('#pageType').val() ; - if ((searchString == null) || (searchString.length < 3)) { - $('#pageType').removeClass('loading'); - $('.liveResult').remove(); - $('.searching').remove(); - CheckEmptyAndLoadList(); - $('.report').remove(); - // debug$('.content').prepend('
  • too short or blank
    • '); // debug - return; - } - if (this.timer) clearTimeout(this.timer); - this.timer = setTimeout(function () { - $('#pageType').addClass('loading'); - $('.searching').remove(); - $('.list ul').prepend('
  • Searching...
    • '); - $.ajax({ - contentType: "application/x-www-form-urlencoded", - url: 'http://' + location.host + '/nokiasearch/GetDataServlet', - data: 'searchString='+searchString, - dataType:'xml', - type: 'post', - success: function (response, textStatus) { - - $('.liveResult').remove(); - $('.searching').remove(); - $('#pageType').removeClass('loading'); - $('.list ul').prepend('
  • Searching...
    • '); - processData(response); - - } - }); - }, 500); - }); - }); diff --git a/doc/templates/scripts/jquery.js b/doc/templates/scripts/jquery.js deleted file mode 100644 index 760f9f6289d..00000000000 --- a/doc/templates/scripts/jquery.js +++ /dev/null @@ -1,152 +0,0 @@ -/*! - * jQuery JavaScript Library v1.4.1 - * http://jquery.com/ - * - * Copyright 2014, John Resig - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * Includes Sizzle.js - * http://sizzlejs.com/ - * Copyright 2014, The Dojo Foundation - * Released under the MIT, BSD, and GPL Licenses. - * - * Date: Mon Jan 25 19:43:33 2010 -0500 - */ -(function(z,v){function la(){if(!c.isReady){try{r.documentElement.doScroll("left")}catch(a){setTimeout(la,1);return}c.ready()}}function Ma(a,b){b.src?c.ajax({url:b.src,async:false,dataType:"script"}):c.globalEval(b.text||b.textContent||b.innerHTML||"");b.parentNode&&b.parentNode.removeChild(b)}function X(a,b,d,f,e,i){var j=a.length;if(typeof b==="object"){for(var n in b)X(a,n,b[n],f,e,d);return a}if(d!==v){f=!i&&f&&c.isFunction(d);for(n=0;n-1){i=j.data;i.beforeFilter&&i.beforeFilter[a.type]&&!i.beforeFilter[a.type](a)||f.push(j.selector)}else delete x[o]}i=c(a.target).closest(f, -a.currentTarget);m=0;for(s=i.length;m)[^>]*$|^#([\w-]+)$/,Qa=/^.[^:#\[\.,]*$/,Ra=/\S/,Sa=/^(\s|\u00A0)+|(\s|\u00A0)+$/g,Ta=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,O=navigator.userAgent, -va=false,P=[],L,$=Object.prototype.toString,aa=Object.prototype.hasOwnProperty,ba=Array.prototype.push,Q=Array.prototype.slice,wa=Array.prototype.indexOf;c.fn=c.prototype={init:function(a,b){var d,f;if(!a)return this;if(a.nodeType){this.context=this[0]=a;this.length=1;return this}if(typeof a==="string")if((d=Pa.exec(a))&&(d[1]||!b))if(d[1]){f=b?b.ownerDocument||b:r;if(a=Ta.exec(a))if(c.isPlainObject(b)){a=[r.createElement(a[1])];c.fn.attr.call(a,b,true)}else a=[f.createElement(a[1])];else{a=ra([d[1]], -[f]);a=(a.cacheable?a.fragment.cloneNode(true):a.fragment).childNodes}}else{if(b=r.getElementById(d[2])){if(b.id!==d[2])return S.find(a);this.length=1;this[0]=b}this.context=r;this.selector=a;return this}else if(!b&&/^\w+$/.test(a)){this.selector=a;this.context=r;a=r.getElementsByTagName(a)}else return!b||b.jquery?(b||S).find(a):c(b).find(a);else if(c.isFunction(a))return S.ready(a);if(a.selector!==v){this.selector=a.selector;this.context=a.context}return c.isArray(a)?this.setArray(a):c.makeArray(a, -this)},selector:"",jquery:"1.4.1",length:0,size:function(){return this.length},toArray:function(){return Q.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this.slice(a)[0]:this[a]},pushStack:function(a,b,d){a=c(a||null);a.prevObject=this;a.context=this.context;if(b==="find")a.selector=this.selector+(this.selector?" ":"")+d;else if(b)a.selector=this.selector+"."+b+"("+d+")";return a},setArray:function(a){this.length=0;ba.apply(this,a);return this},each:function(a,b){return c.each(this, -a,b)},ready:function(a){c.bindReady();if(c.isReady)a.call(r,c);else P&&P.push(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(Q.apply(this,arguments),"slice",Q.call(arguments).join(","))},map:function(a){return this.pushStack(c.map(this,function(b,d){return a.call(b,d,b)}))},end:function(){return this.prevObject||c(null)},push:ba,sort:[].sort,splice:[].splice}; -c.fn.init.prototype=c.fn;c.extend=c.fn.extend=function(){var a=arguments[0]||{},b=1,d=arguments.length,f=false,e,i,j,n;if(typeof a==="boolean"){f=a;a=arguments[1]||{};b=2}if(typeof a!=="object"&&!c.isFunction(a))a={};if(d===b){a=this;--b}for(;b
    a";var e=d.getElementsByTagName("*"),i=d.getElementsByTagName("a")[0];if(!(!e||!e.length||!i)){c.support= -{leadingWhitespace:d.firstChild.nodeType===3,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/red/.test(i.getAttribute("style")),hrefNormalized:i.getAttribute("href")==="/a",opacity:/^0.55$/.test(i.style.opacity),cssFloat:!!i.style.cssFloat,checkOn:d.getElementsByTagName("input")[0].value==="on",optSelected:r.createElement("select").appendChild(r.createElement("option")).selected,checkClone:false,scriptEval:false,noCloneEvent:true,boxModel:null}; -b.type="text/javascript";try{b.appendChild(r.createTextNode("window."+f+"=1;"))}catch(j){}a.insertBefore(b,a.firstChild);if(z[f]){c.support.scriptEval=true;delete z[f]}a.removeChild(b);if(d.attachEvent&&d.fireEvent){d.attachEvent("onclick",function n(){c.support.noCloneEvent=false;d.detachEvent("onclick",n)});d.cloneNode(true).fireEvent("onclick")}d=r.createElement("div");d.innerHTML="";a=r.createDocumentFragment();a.appendChild(d.firstChild); -c.support.checkClone=a.cloneNode(true).cloneNode(true).lastChild.checked;c(function(){var n=r.createElement("div");n.style.width=n.style.paddingLeft="1px";r.body.appendChild(n);c.boxModel=c.support.boxModel=n.offsetWidth===2;r.body.removeChild(n).style.display="none"});a=function(n){var o=r.createElement("div");n="on"+n;var m=n in o;if(!m){o.setAttribute(n,"return;");m=typeof o[n]==="function"}return m};c.support.submitBubbles=a("submit");c.support.changeBubbles=a("change");a=b=d=e=i=null}})();c.props= -{"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"};var G="jQuery"+J(),Ua=0,xa={},Va={};c.extend({cache:{},expando:G,noData:{embed:true,object:true,applet:true},data:function(a,b,d){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==z?xa:a;var f=a[G],e=c.cache;if(!b&&!f)return null;f||(f=++Ua);if(typeof b==="object"){a[G]=f;e=e[f]=c.extend(true, -{},b)}else e=e[f]?e[f]:typeof d==="undefined"?Va:(e[f]={});if(d!==v){a[G]=f;e[b]=d}return typeof b==="string"?e[b]:e}},removeData:function(a,b){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==z?xa:a;var d=a[G],f=c.cache,e=f[d];if(b){if(e){delete e[b];c.isEmptyObject(e)&&c.removeData(a)}}else{try{delete a[G]}catch(i){a.removeAttribute&&a.removeAttribute(G)}delete f[d]}}}});c.fn.extend({data:function(a,b){if(typeof a==="undefined"&&this.length)return c.data(this[0]);else if(typeof a==="object")return this.each(function(){c.data(this, -a)});var d=a.split(".");d[1]=d[1]?"."+d[1]:"";if(b===v){var f=this.triggerHandler("getData"+d[1]+"!",[d[0]]);if(f===v&&this.length)f=c.data(this[0],a);return f===v&&d[1]?this.data(d[0]):f}else return this.trigger("setData"+d[1]+"!",[d[0],b]).each(function(){c.data(this,a,b)})},removeData:function(a){return this.each(function(){c.removeData(this,a)})}});c.extend({queue:function(a,b,d){if(a){b=(b||"fx")+"queue";var f=c.data(a,b);if(!d)return f||[];if(!f||c.isArray(d))f=c.data(a,b,c.makeArray(d));else f.push(d); -return f}},dequeue:function(a,b){b=b||"fx";var d=c.queue(a,b),f=d.shift();if(f==="inprogress")f=d.shift();if(f){b==="fx"&&d.unshift("inprogress");f.call(a,function(){c.dequeue(a,b)})}}});c.fn.extend({queue:function(a,b){if(typeof a!=="string"){b=a;a="fx"}if(b===v)return c.queue(this[0],a);return this.each(function(){var d=c.queue(this,a,b);a==="fx"&&d[0]!=="inprogress"&&c.dequeue(this,a)})},dequeue:function(a){return this.each(function(){c.dequeue(this,a)})},delay:function(a,b){a=c.fx?c.fx.speeds[a]|| -a:a;b=b||"fx";return this.queue(b,function(){var d=this;setTimeout(function(){c.dequeue(d,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])}});var ya=/[\n\t]/g,ca=/\s+/,Wa=/\r/g,Xa=/href|src|style/,Ya=/(button|input)/i,Za=/(button|input|object|select|textarea)/i,$a=/^(a|area)$/i,za=/radio|checkbox/;c.fn.extend({attr:function(a,b){return X(this,a,b,true,c.attr)},removeAttr:function(a){return this.each(function(){c.attr(this,a,"");this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if(c.isFunction(a))return this.each(function(o){var m= -c(this);m.addClass(a.call(this,o,m.attr("class")))});if(a&&typeof a==="string")for(var b=(a||"").split(ca),d=0,f=this.length;d-1)return true;return false},val:function(a){if(a===v){var b=this[0];if(b){if(c.nodeName(b,"option"))return(b.attributes.value|| -{}).specified?b.value:b.text;if(c.nodeName(b,"select")){var d=b.selectedIndex,f=[],e=b.options;b=b.type==="select-one";if(d<0)return null;var i=b?d:0;for(d=b?d+1:e.length;i=0;else if(c.nodeName(this,"select")){var x=c.makeArray(s);c("option",this).each(function(){this.selected=c.inArray(c(this).val(),x)>=0});if(!x.length)this.selectedIndex=-1}else this.value=s}})}});c.extend({attrFn:{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true},attr:function(a,b,d,f){if(!a||a.nodeType===3||a.nodeType===8)return v;if(f&&b in c.attrFn)return c(a)[b](d); -f=a.nodeType!==1||!c.isXMLDoc(a);var e=d!==v;b=f&&c.props[b]||b;if(a.nodeType===1){var i=Xa.test(b);if(b in a&&f&&!i){if(e){b==="type"&&Ya.test(a.nodeName)&&a.parentNode&&c.error("type property can't be changed");a[b]=d}if(c.nodeName(a,"form")&&a.getAttributeNode(b))return a.getAttributeNode(b).nodeValue;if(b==="tabIndex")return(b=a.getAttributeNode("tabIndex"))&&b.specified?b.value:Za.test(a.nodeName)||$a.test(a.nodeName)&&a.href?0:v;return a[b]}if(!c.support.style&&f&&b==="style"){if(e)a.style.cssText= -""+d;return a.style.cssText}e&&a.setAttribute(b,""+d);a=!c.support.hrefNormalized&&f&&i?a.getAttribute(b,2):a.getAttribute(b);return a===null?v:a}return c.style(a,b,d)}});var ab=function(a){return a.replace(/[^\w\s\.\|`]/g,function(b){return"\\"+b})};c.event={add:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){if(a.setInterval&&a!==z&&!a.frameElement)a=z;if(!d.guid)d.guid=c.guid++;if(f!==v){d=c.proxy(d);d.data=f}var e=c.data(a,"events")||c.data(a,"events",{}),i=c.data(a,"handle"),j;if(!i){j= -function(){return typeof c!=="undefined"&&!c.event.triggered?c.event.handle.apply(j.elem,arguments):v};i=c.data(a,"handle",j)}if(i){i.elem=a;b=b.split(/\s+/);for(var n,o=0;n=b[o++];){var m=n.split(".");n=m.shift();if(o>1){d=c.proxy(d);if(f!==v)d.data=f}d.type=m.slice(0).sort().join(".");var s=e[n],x=this.special[n]||{};if(!s){s=e[n]={};if(!x.setup||x.setup.call(a,f,m,d)===false)if(a.addEventListener)a.addEventListener(n,i,false);else a.attachEvent&&a.attachEvent("on"+n,i)}if(x.add)if((m=x.add.call(a, -d,f,m,s))&&c.isFunction(m)){m.guid=m.guid||d.guid;m.data=m.data||d.data;m.type=m.type||d.type;d=m}s[d.guid]=d;this.global[n]=true}a=null}}},global:{},remove:function(a,b,d){if(!(a.nodeType===3||a.nodeType===8)){var f=c.data(a,"events"),e,i,j;if(f){if(b===v||typeof b==="string"&&b.charAt(0)===".")for(i in f)this.remove(a,i+(b||""));else{if(b.type){d=b.handler;b=b.type}b=b.split(/\s+/);for(var n=0;i=b[n++];){var o=i.split(".");i=o.shift();var m=!o.length,s=c.map(o.slice(0).sort(),ab);s=new RegExp("(^|\\.)"+ -s.join("\\.(?:.*\\.)?")+"(\\.|$)");var x=this.special[i]||{};if(f[i]){if(d){j=f[i][d.guid];delete f[i][d.guid]}else for(var A in f[i])if(m||s.test(f[i][A].type))delete f[i][A];x.remove&&x.remove.call(a,o,j);for(e in f[i])break;if(!e){if(!x.teardown||x.teardown.call(a,o)===false)if(a.removeEventListener)a.removeEventListener(i,c.data(a,"handle"),false);else a.detachEvent&&a.detachEvent("on"+i,c.data(a,"handle"));e=null;delete f[i]}}}}for(e in f)break;if(!e){if(A=c.data(a,"handle"))A.elem=null;c.removeData(a, -"events");c.removeData(a,"handle")}}}},trigger:function(a,b,d,f){var e=a.type||a;if(!f){a=typeof a==="object"?a[G]?a:c.extend(c.Event(e),a):c.Event(e);if(e.indexOf("!")>=0){a.type=e=e.slice(0,-1);a.exclusive=true}if(!d){a.stopPropagation();this.global[e]&&c.each(c.cache,function(){this.events&&this.events[e]&&c.event.trigger(a,b,this.handle.elem)})}if(!d||d.nodeType===3||d.nodeType===8)return v;a.result=v;a.target=d;b=c.makeArray(b);b.unshift(a)}a.currentTarget=d;(f=c.data(d,"handle"))&&f.apply(d, -b);f=d.parentNode||d.ownerDocument;try{if(!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()]))if(d["on"+e]&&d["on"+e].apply(d,b)===false)a.result=false}catch(i){}if(!a.isPropagationStopped()&&f)c.event.trigger(a,b,f,true);else if(!a.isDefaultPrevented()){d=a.target;var j;if(!(c.nodeName(d,"a")&&e==="click")&&!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()])){try{if(d[e]){if(j=d["on"+e])d["on"+e]=null;this.triggered=true;d[e]()}}catch(n){}if(j)d["on"+e]=j;this.triggered=false}}},handle:function(a){var b, -d;a=arguments[0]=c.event.fix(a||z.event);a.currentTarget=this;d=a.type.split(".");a.type=d.shift();b=!d.length&&!a.exclusive;var f=new RegExp("(^|\\.)"+d.slice(0).sort().join("\\.(?:.*\\.)?")+"(\\.|$)");d=(c.data(this,"events")||{})[a.type];for(var e in d){var i=d[e];if(b||f.test(i.type)){a.handler=i;a.data=i.data;i=i.apply(this,arguments);if(i!==v){a.result=i;if(i===false){a.preventDefault();a.stopPropagation()}}if(a.isImmediatePropagationStopped())break}}return a.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "), -fix:function(a){if(a[G])return a;var b=a;a=c.Event(b);for(var d=this.props.length,f;d;){f=this.props[--d];a[f]=b[f]}if(!a.target)a.target=a.srcElement||r;if(a.target.nodeType===3)a.target=a.target.parentNode;if(!a.relatedTarget&&a.fromElement)a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement;if(a.pageX==null&&a.clientX!=null){b=r.documentElement;d=r.body;a.pageX=a.clientX+(b&&b.scrollLeft||d&&d.scrollLeft||0)-(b&&b.clientLeft||d&&d.clientLeft||0);a.pageY=a.clientY+(b&&b.scrollTop|| -d&&d.scrollTop||0)-(b&&b.clientTop||d&&d.clientTop||0)}if(!a.which&&(a.charCode||a.charCode===0?a.charCode:a.keyCode))a.which=a.charCode||a.keyCode;if(!a.metaKey&&a.ctrlKey)a.metaKey=a.ctrlKey;if(!a.which&&a.button!==v)a.which=a.button&1?1:a.button&2?3:a.button&4?2:0;return a},guid:1E8,proxy:c.proxy,special:{ready:{setup:c.bindReady,teardown:c.noop},live:{add:function(a,b){c.extend(a,b||{});a.guid+=b.selector+b.live;b.liveProxy=a;c.event.add(this,b.live,na,b)},remove:function(a){if(a.length){var b= -0,d=new RegExp("(^|\\.)"+a[0]+"(\\.|$)");c.each(c.data(this,"events").live||{},function(){d.test(this.type)&&b++});b<1&&c.event.remove(this,a[0],na)}},special:{}},beforeunload:{setup:function(a,b,d){if(this.setInterval)this.onbeforeunload=d;return false},teardown:function(a,b){if(this.onbeforeunload===b)this.onbeforeunload=null}}}};c.Event=function(a){if(!this.preventDefault)return new c.Event(a);if(a&&a.type){this.originalEvent=a;this.type=a.type}else this.type=a;this.timeStamp=J();this[G]=true}; -c.Event.prototype={preventDefault:function(){this.isDefaultPrevented=Z;var a=this.originalEvent;if(a){a.preventDefault&&a.preventDefault();a.returnValue=false}},stopPropagation:function(){this.isPropagationStopped=Z;var a=this.originalEvent;if(a){a.stopPropagation&&a.stopPropagation();a.cancelBubble=true}},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=Z;this.stopPropagation()},isDefaultPrevented:Y,isPropagationStopped:Y,isImmediatePropagationStopped:Y};var Aa=function(a){for(var b= -a.relatedTarget;b&&b!==this;)try{b=b.parentNode}catch(d){break}if(b!==this){a.type=a.data;c.event.handle.apply(this,arguments)}},Ba=function(a){a.type=a.data;c.event.handle.apply(this,arguments)};c.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){c.event.special[a]={setup:function(d){c.event.add(this,b,d&&d.selector?Ba:Aa,a)},teardown:function(d){c.event.remove(this,b,d&&d.selector?Ba:Aa)}}});if(!c.support.submitBubbles)c.event.special.submit={setup:function(a,b,d){if(this.nodeName.toLowerCase()!== -"form"){c.event.add(this,"click.specialSubmit."+d.guid,function(f){var e=f.target,i=e.type;if((i==="submit"||i==="image")&&c(e).closest("form").length)return ma("submit",this,arguments)});c.event.add(this,"keypress.specialSubmit."+d.guid,function(f){var e=f.target,i=e.type;if((i==="text"||i==="password")&&c(e).closest("form").length&&f.keyCode===13)return ma("submit",this,arguments)})}else return false},remove:function(a,b){c.event.remove(this,"click.specialSubmit"+(b?"."+b.guid:""));c.event.remove(this, -"keypress.specialSubmit"+(b?"."+b.guid:""))}};if(!c.support.changeBubbles){var da=/textarea|input|select/i;function Ca(a){var b=a.type,d=a.value;if(b==="radio"||b==="checkbox")d=a.checked;else if(b==="select-multiple")d=a.selectedIndex>-1?c.map(a.options,function(f){return f.selected}).join("-"):"";else if(a.nodeName.toLowerCase()==="select")d=a.selectedIndex;return d}function ea(a,b){var d=a.target,f,e;if(!(!da.test(d.nodeName)||d.readOnly)){f=c.data(d,"_change_data");e=Ca(d);if(a.type!=="focusout"|| -d.type!=="radio")c.data(d,"_change_data",e);if(!(f===v||e===f))if(f!=null||e){a.type="change";return c.event.trigger(a,b,d)}}}c.event.special.change={filters:{focusout:ea,click:function(a){var b=a.target,d=b.type;if(d==="radio"||d==="checkbox"||b.nodeName.toLowerCase()==="select")return ea.call(this,a)},keydown:function(a){var b=a.target,d=b.type;if(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(d==="checkbox"||d==="radio")||d==="select-multiple")return ea.call(this,a)},beforeactivate:function(a){a= -a.target;a.nodeName.toLowerCase()==="input"&&a.type==="radio"&&c.data(a,"_change_data",Ca(a))}},setup:function(a,b,d){for(var f in T)c.event.add(this,f+".specialChange."+d.guid,T[f]);return da.test(this.nodeName)},remove:function(a,b){for(var d in T)c.event.remove(this,d+".specialChange"+(b?"."+b.guid:""),T[d]);return da.test(this.nodeName)}};var T=c.event.special.change.filters}r.addEventListener&&c.each({focus:"focusin",blur:"focusout"},function(a,b){function d(f){f=c.event.fix(f);f.type=b;return c.event.handle.call(this, -f)}c.event.special[b]={setup:function(){this.addEventListener(a,d,true)},teardown:function(){this.removeEventListener(a,d,true)}}});c.each(["bind","one"],function(a,b){c.fn[b]=function(d,f,e){if(typeof d==="object"){for(var i in d)this[b](i,f,d[i],e);return this}if(c.isFunction(f)){e=f;f=v}var j=b==="one"?c.proxy(e,function(n){c(this).unbind(n,j);return e.apply(this,arguments)}):e;return d==="unload"&&b!=="one"?this.one(d,f,e):this.each(function(){c.event.add(this,d,j,f)})}});c.fn.extend({unbind:function(a, -b){if(typeof a==="object"&&!a.preventDefault){for(var d in a)this.unbind(d,a[d]);return this}return this.each(function(){c.event.remove(this,a,b)})},trigger:function(a,b){return this.each(function(){c.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0]){a=c.Event(a);a.preventDefault();a.stopPropagation();c.event.trigger(a,b,this[0]);return a.result}},toggle:function(a){for(var b=arguments,d=1;d0){y=t;break}}t=t[g]}l[q]=y}}}var f=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,e=0,i=Object.prototype.toString,j=false,n=true;[0,0].sort(function(){n=false;return 0});var o=function(g,h,k,l){k=k||[];var q=h=h||r;if(h.nodeType!==1&&h.nodeType!==9)return[];if(!g|| -typeof g!=="string")return k;for(var p=[],u,t,y,R,H=true,M=w(h),I=g;(f.exec(""),u=f.exec(I))!==null;){I=u[3];p.push(u[1]);if(u[2]){R=u[3];break}}if(p.length>1&&s.exec(g))if(p.length===2&&m.relative[p[0]])t=fa(p[0]+p[1],h);else for(t=m.relative[p[0]]?[h]:o(p.shift(),h);p.length;){g=p.shift();if(m.relative[g])g+=p.shift();t=fa(g,t)}else{if(!l&&p.length>1&&h.nodeType===9&&!M&&m.match.ID.test(p[0])&&!m.match.ID.test(p[p.length-1])){u=o.find(p.shift(),h,M);h=u.expr?o.filter(u.expr,u.set)[0]:u.set[0]}if(h){u= -l?{expr:p.pop(),set:A(l)}:o.find(p.pop(),p.length===1&&(p[0]==="~"||p[0]==="+")&&h.parentNode?h.parentNode:h,M);t=u.expr?o.filter(u.expr,u.set):u.set;if(p.length>0)y=A(t);else H=false;for(;p.length;){var D=p.pop();u=D;if(m.relative[D])u=p.pop();else D="";if(u==null)u=h;m.relative[D](y,u,M)}}else y=[]}y||(y=t);y||o.error(D||g);if(i.call(y)==="[object Array]")if(H)if(h&&h.nodeType===1)for(g=0;y[g]!=null;g++){if(y[g]&&(y[g]===true||y[g].nodeType===1&&E(h,y[g])))k.push(t[g])}else for(g=0;y[g]!=null;g++)y[g]&& -y[g].nodeType===1&&k.push(t[g]);else k.push.apply(k,y);else A(y,k);if(R){o(R,q,k,l);o.uniqueSort(k)}return k};o.uniqueSort=function(g){if(C){j=n;g.sort(C);if(j)for(var h=1;h":function(g,h){var k=typeof h==="string";if(k&&!/\W/.test(h)){h=h.toLowerCase();for(var l=0,q=g.length;l=0))k||l.push(u);else if(k)h[p]=false;return false},ID:function(g){return g[1].replace(/\\/g,"")},TAG:function(g){return g[1].toLowerCase()},CHILD:function(g){if(g[1]==="nth"){var h=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(g[2]==="even"&&"2n"||g[2]==="odd"&& -"2n+1"||!/\D/.test(g[2])&&"0n+"+g[2]||g[2]);g[2]=h[1]+(h[2]||1)-0;g[3]=h[3]-0}g[0]=e++;return g},ATTR:function(g,h,k,l,q,p){h=g[1].replace(/\\/g,"");if(!p&&m.attrMap[h])g[1]=m.attrMap[h];if(g[2]==="~=")g[4]=" "+g[4]+" ";return g},PSEUDO:function(g,h,k,l,q){if(g[1]==="not")if((f.exec(g[3])||"").length>1||/^\w/.test(g[3]))g[3]=o(g[3],null,null,h);else{g=o.filter(g[3],h,k,true^q);k||l.push.apply(l,g);return false}else if(m.match.POS.test(g[0])||m.match.CHILD.test(g[0]))return true;return g},POS:function(g){g.unshift(true); -return g}},filters:{enabled:function(g){return g.disabled===false&&g.type!=="hidden"},disabled:function(g){return g.disabled===true},checked:function(g){return g.checked===true},selected:function(g){return g.selected===true},parent:function(g){return!!g.firstChild},empty:function(g){return!g.firstChild},has:function(g,h,k){return!!o(k[3],g).length},header:function(g){return/h\d/i.test(g.nodeName)},text:function(g){return"text"===g.type},radio:function(g){return"radio"===g.type},checkbox:function(g){return"checkbox"=== -g.type},file:function(g){return"file"===g.type},password:function(g){return"password"===g.type},submit:function(g){return"submit"===g.type},image:function(g){return"image"===g.type},reset:function(g){return"reset"===g.type},button:function(g){return"button"===g.type||g.nodeName.toLowerCase()==="button"},input:function(g){return/input|select|textarea|button/i.test(g.nodeName)}},setFilters:{first:function(g,h){return h===0},last:function(g,h,k,l){return h===l.length-1},even:function(g,h){return h%2=== -0},odd:function(g,h){return h%2===1},lt:function(g,h,k){return hk[3]-0},nth:function(g,h,k){return k[3]-0===h},eq:function(g,h,k){return k[3]-0===h}},filter:{PSEUDO:function(g,h,k,l){var q=h[1],p=m.filters[q];if(p)return p(g,k,h,l);else if(q==="contains")return(g.textContent||g.innerText||a([g])||"").indexOf(h[3])>=0;else if(q==="not"){h=h[3];k=0;for(l=h.length;k= -0}},ID:function(g,h){return g.nodeType===1&&g.getAttribute("id")===h},TAG:function(g,h){return h==="*"&&g.nodeType===1||g.nodeName.toLowerCase()===h},CLASS:function(g,h){return(" "+(g.className||g.getAttribute("class"))+" ").indexOf(h)>-1},ATTR:function(g,h){var k=h[1];g=m.attrHandle[k]?m.attrHandle[k](g):g[k]!=null?g[k]:g.getAttribute(k);k=g+"";var l=h[2];h=h[4];return g==null?l==="!=":l==="="?k===h:l==="*="?k.indexOf(h)>=0:l==="~="?(" "+k+" ").indexOf(h)>=0:!h?k&&g!==false:l==="!="?k!==h:l==="^="? -k.indexOf(h)===0:l==="$="?k.substr(k.length-h.length)===h:l==="|="?k===h||k.substr(0,h.length+1)===h+"-":false},POS:function(g,h,k,l){var q=m.setFilters[h[2]];if(q)return q(g,k,h,l)}}},s=m.match.POS;for(var x in m.match){m.match[x]=new RegExp(m.match[x].source+/(?![^\[]*\])(?![^\(]*\))/.source);m.leftMatch[x]=new RegExp(/(^(?:.|\r|\n)*?)/.source+m.match[x].source.replace(/\\(\d+)/g,function(g,h){return"\\"+(h-0+1)}))}var A=function(g,h){g=Array.prototype.slice.call(g,0);if(h){h.push.apply(h,g);return h}return g}; -try{Array.prototype.slice.call(r.documentElement.childNodes,0)}catch(B){A=function(g,h){h=h||[];if(i.call(g)==="[object Array]")Array.prototype.push.apply(h,g);else if(typeof g.length==="number")for(var k=0,l=g.length;k";var k=r.documentElement;k.insertBefore(g,k.firstChild);if(r.getElementById(h)){m.find.ID=function(l,q,p){if(typeof q.getElementById!=="undefined"&&!p)return(q=q.getElementById(l[1]))?q.id===l[1]||typeof q.getAttributeNode!=="undefined"&&q.getAttributeNode("id").nodeValue===l[1]?[q]:v:[]};m.filter.ID=function(l,q){var p=typeof l.getAttributeNode!=="undefined"&&l.getAttributeNode("id"); -return l.nodeType===1&&p&&p.nodeValue===q}}k.removeChild(g);k=g=null})();(function(){var g=r.createElement("div");g.appendChild(r.createComment(""));if(g.getElementsByTagName("*").length>0)m.find.TAG=function(h,k){k=k.getElementsByTagName(h[1]);if(h[1]==="*"){h=[];for(var l=0;k[l];l++)k[l].nodeType===1&&h.push(k[l]);k=h}return k};g.innerHTML="";if(g.firstChild&&typeof g.firstChild.getAttribute!=="undefined"&&g.firstChild.getAttribute("href")!=="#")m.attrHandle.href=function(h){return h.getAttribute("href", -2)};g=null})();r.querySelectorAll&&function(){var g=o,h=r.createElement("div");h.innerHTML="

    ";if(!(h.querySelectorAll&&h.querySelectorAll(".TEST").length===0)){o=function(l,q,p,u){q=q||r;if(!u&&q.nodeType===9&&!w(q))try{return A(q.querySelectorAll(l),p)}catch(t){}return g(l,q,p,u)};for(var k in g)o[k]=g[k];h=null}}();(function(){var g=r.createElement("div");g.innerHTML="
    ";if(!(!g.getElementsByClassName||g.getElementsByClassName("e").length=== -0)){g.lastChild.className="e";if(g.getElementsByClassName("e").length!==1){m.order.splice(1,0,"CLASS");m.find.CLASS=function(h,k,l){if(typeof k.getElementsByClassName!=="undefined"&&!l)return k.getElementsByClassName(h[1])};g=null}}})();var E=r.compareDocumentPosition?function(g,h){return g.compareDocumentPosition(h)&16}:function(g,h){return g!==h&&(g.contains?g.contains(h):true)},w=function(g){return(g=(g?g.ownerDocument||g:0).documentElement)?g.nodeName!=="HTML":false},fa=function(g,h){var k=[], -l="",q;for(h=h.nodeType?[h]:h;q=m.match.PSEUDO.exec(g);){l+=q[0];g=g.replace(m.match.PSEUDO,"")}g=m.relative[g]?g+"*":g;q=0;for(var p=h.length;q=0===d})};c.fn.extend({find:function(a){for(var b=this.pushStack("","find",a),d=0,f=0,e=this.length;f0)for(var i=d;i0},closest:function(a,b){if(c.isArray(a)){var d=[],f=this[0],e,i={},j;if(f&&a.length){e=0;for(var n=a.length;e --1:c(f).is(e)){d.push({selector:j,elem:f});delete i[j]}}f=f.parentNode}}return d}var o=c.expr.match.POS.test(a)?c(a,b||this.context):null;return this.map(function(m,s){for(;s&&s.ownerDocument&&s!==b;){if(o?o.index(s)>-1:c(s).is(a))return s;s=s.parentNode}return null})},index:function(a){if(!a||typeof a==="string")return c.inArray(this[0],a?c(a):this.parent().children());return c.inArray(a.jquery?a[0]:a,this)},add:function(a,b){a=typeof a==="string"?c(a,b||this.context):c.makeArray(a);b=c.merge(this.get(), -a);return this.pushStack(pa(a[0])||pa(b[0])?b:c.unique(b))},andSelf:function(){return this.add(this.prevObject)}});c.each({parent:function(a){return(a=a.parentNode)&&a.nodeType!==11?a:null},parents:function(a){return c.dir(a,"parentNode")},parentsUntil:function(a,b,d){return c.dir(a,"parentNode",d)},next:function(a){return c.nth(a,2,"nextSibling")},prev:function(a){return c.nth(a,2,"previousSibling")},nextAll:function(a){return c.dir(a,"nextSibling")},prevAll:function(a){return c.dir(a,"previousSibling")}, -nextUntil:function(a,b,d){return c.dir(a,"nextSibling",d)},prevUntil:function(a,b,d){return c.dir(a,"previousSibling",d)},siblings:function(a){return c.sibling(a.parentNode.firstChild,a)},children:function(a){return c.sibling(a.firstChild)},contents:function(a){return c.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:c.makeArray(a.childNodes)}},function(a,b){c.fn[a]=function(d,f){var e=c.map(this,b,d);bb.test(a)||(f=d);if(f&&typeof f==="string")e=c.filter(f,e);e=this.length>1?c.unique(e): -e;if((this.length>1||db.test(f))&&cb.test(a))e=e.reverse();return this.pushStack(e,a,Q.call(arguments).join(","))}});c.extend({filter:function(a,b,d){if(d)a=":not("+a+")";return c.find.matches(a,b)},dir:function(a,b,d){var f=[];for(a=a[b];a&&a.nodeType!==9&&(d===v||a.nodeType!==1||!c(a).is(d));){a.nodeType===1&&f.push(a);a=a[b]}return f},nth:function(a,b,d){b=b||1;for(var f=0;a;a=a[d])if(a.nodeType===1&&++f===b)break;return a},sibling:function(a,b){for(var d=[];a;a=a.nextSibling)a.nodeType===1&&a!== -b&&d.push(a);return d}});var Fa=/ jQuery\d+="(?:\d+|null)"/g,V=/^\s+/,Ga=/(<([\w:]+)[^>]*?)\/>/g,eb=/^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i,Ha=/<([\w:]+)/,fb=/"},F={option:[1,""],legend:[1,"
    ","
    "],thead:[1,"","
    "],tr:[2,"","
    "],td:[3,"","
    "], -col:[2,"","
    "],area:[1,"",""],_default:[0,"",""]};F.optgroup=F.option;F.tbody=F.tfoot=F.colgroup=F.caption=F.thead;F.th=F.td;if(!c.support.htmlSerialize)F._default=[1,"div
    ","
    "];c.fn.extend({text:function(a){if(c.isFunction(a))return this.each(function(b){var d=c(this);d.text(a.call(this,b,d.text()))});if(typeof a!=="object"&&a!==v)return this.empty().append((this[0]&&this[0].ownerDocument||r).createTextNode(a));return c.getText(this)}, -wrapAll:function(a){if(c.isFunction(a))return this.each(function(d){c(this).wrapAll(a.call(this,d))});if(this[0]){var b=c(a,this[0].ownerDocument).eq(0).clone(true);this[0].parentNode&&b.insertBefore(this[0]);b.map(function(){for(var d=this;d.firstChild&&d.firstChild.nodeType===1;)d=d.firstChild;return d}).append(this)}return this},wrapInner:function(a){if(c.isFunction(a))return this.each(function(b){c(this).wrapInner(a.call(this,b))});return this.each(function(){var b=c(this),d=b.contents();d.length? -d.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){c(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){c.nodeName(this,"body")||c(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments, -false,function(b){this.parentNode.insertBefore(b,this)});else if(arguments.length){var a=c(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,this.nextSibling)});else if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,c(arguments[0]).toArray());return a}},clone:function(a){var b=this.map(function(){if(!c.support.noCloneEvent&& -!c.isXMLDoc(this)){var d=this.outerHTML,f=this.ownerDocument;if(!d){d=f.createElement("div");d.appendChild(this.cloneNode(true));d=d.innerHTML}return c.clean([d.replace(Fa,"").replace(V,"")],f)[0]}else return this.cloneNode(true)});if(a===true){qa(this,b);qa(this.find("*"),b.find("*"))}return b},html:function(a){if(a===v)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(Fa,""):null;else if(typeof a==="string"&&!/